feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Combine the InferiorShutdown{Ok,Failed} states

Browse Source 
... into a InferiorShutdownFinished.

Change-Id: Icb5394f38f52f7cf300dc83f4eb8f2f0777bbcba
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-12-14 09:36:41 +01:00
parent ee9ecf8661
commit 83c13ff191
11 changed files with 56 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -103,9 +103,8 @@ static bool stateAcceptsGdbCommands(DebuggerState state)
case InferiorStopRequested:
case InferiorStopOk:
case InferiorShutdownRequested:
case InferiorShutdownFinished:
case EngineShutdownRequested:
case InferiorShutdownOk:
case InferiorShutdownFailed:
return true;
case DebuggerNotReady:
case InferiorStopFailed:
@@ -1739,7 +1738,7 @@ void GdbEngine::handleInferiorShutdown(const DebuggerResponse &response)
if (response.resultClass == ResultDone) {
// We'll get async thread-group-exited responses to which we react.
// Nothing to do here.
// notifyInferiorShutdownOk();
// notifyInferiorShutdownFinished();
return;
}
// "kill" got stuck, or similar.
@@ -1749,12 +1748,11 @@ void GdbEngine::handleInferiorShutdown(const DebuggerResponse &response)
// This happens when someone removed the binary behind our back.
// It is not really an error from a user's point of view.
showMessage("NOTE: " + msg);
notifyInferiorShutdownOk();
return;
} else {
AsynchronousMessageBox::critical(tr("Failed to Shut Down Application"),
msgInferiorStopFailed(msg));
}
AsynchronousMessageBox::critical(tr("Failed to Shut Down Application"),
msgInferiorStopFailed(msg));
notifyInferiorShutdownFailed();
notifyInferiorShutdownFinished();
}
void GdbEngine::handleGdbExit(const DebuggerResponse &response)