diff options
| author | hjk <qtc-committer@nokia.com> | 2010-07-15 14:03:45 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-07-15 14:54:43 +0200 |
| commit | 475bc51392a2499335c8b3ae879a7a660fd8656e (patch) | |
| tree | f71d593095d9682455a7a4d6d8bb126e89b70bd7 /src/plugins | |
| parent | 42f326af6016cc95ea6390311e3fc71006127303 (diff) | |
| download | qt-creator-475bc51392a2499335c8b3ae879a7a660fd8656e.tar.gz | |
debugger: there are several states that do not accept commands
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 067be6fe3b..9e38513c04 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -652,7 +652,6 @@ void GdbEngine::interruptInferiorTemporarily() foreach (const GdbCommand &cmd, m_commandsToRunOnTemporaryBreak) { if (cmd.flags & LosesChild) { notifyInferiorIll(); - //setState(InferiorStopRequested_Kill); break; } } @@ -751,7 +750,6 @@ void GdbEngine::postCommandHelper(const GdbCommand &cmd) if (state() == InferiorStopRequested) { if (cmd.flags & LosesChild) { notifyInferiorIll(); - //setState(InferiorStopRequested_Kill); } showMessage(_("CHILD ALREADY BEING INTERRUPTED. STILL HOPING.")); // Calling shutdown() here breaks all situations where two @@ -792,14 +790,14 @@ void GdbEngine::flushQueuedCommands() void GdbEngine::flushCommand(const GdbCommand &cmd0) { - GdbCommand cmd = cmd0; - if (state() == DebuggerNotReady) { - showMessage(_(cmd.command), LogInput); - showMessage(_("GDB PROCESS NOT RUNNING, PLAIN CMD IGNORED: " + cmd.command)); + if (!stateAcceptsGdbCommands(state())) { + showMessage(_(cmd0.command), LogInput); + showMessage(_("GDB PROCESS ACCEPTS NO CMD IN STATE %1 ").arg(state())); return; } ++currentToken(); + GdbCommand cmd = cmd0; cmd.postTime = QTime::currentTime(); m_cookieForToken[currentToken()] = cmd; if (cmd.flags & ConsoleCommand) |