From bf4d9aed33f0b49cf8f6d4d5edd1915d70f326c3 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Mon, 16 Apr 2012 09:47:50 +0200
Subject: [PATCH] DebuggerEngine: Goto Location

Check for OperateByInstructionCapability before using the
disassembler agent.

Change-Id: I35f69f8df5da41eee22b2a94fe2d33c67b4d7f92
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/debugger/debuggerengine.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 23ac6b7b1d5..f0c0eb549d3 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -615,7 +615,8 @@ void DebuggerEngine::gotoLocation(const Location &loc)
 {
      d->resetLocation();
 
-    if (debuggerCore()->boolSetting(OperateByInstruction) || !loc.hasDebugInfo()) {
+    if ((hasCapability(OperateByInstructionCapability) &&
+            debuggerCore()->boolSetting(OperateByInstruction)) || !loc.hasDebugInfo()) {
         d->m_disassemblerAgent.setLocation(loc);
         return;
     }