Merge commit 'origin/1.3'

2009-11-30 18:23:13 +01:00
parent 522835ae01 5bcff248fb
commit 85b6ee648c
5 changed files with 7 additions and 3 deletions
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -1588,6 +1588,8 @@ QList<Symbol> CdbDebugEngine::moduleSymbols(const QString &moduleName)

 void CdbDebugEngine::reloadRegisters()
 {
+    if (state() != InferiorStopped)
+        return;
    const int intBase = 10;
    if (debugCDB)
        qDebug() << Q_FUNC_INFO << intBase;
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2568,6 +2568,8 @@ void GdbEngine::handleStackListThreads(const GdbResponse &response)

 void GdbEngine::reloadRegisters()
 {
+    if (state() != InferiorStopped)
+        return;
    if (!m_registerNamesListed) {
        postCommand(_("-data-list-register-names"), CB(handleRegisterListNames));
        m_registerNamesListed = true;