summaryrefslogtreecommitdiff
path: root/src/plugins/debugger
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-10-20 18:04:15 +0200
committerhjk <hjk121@nokiamail.com>2014-10-21 09:39:05 +0200
commit0c42d826ae62e5b725f9a6b3288ddcb014b7bcc3 (patch)
tree4e9138d169a3a953e9e2ed2325351662a6282986 /src/plugins/debugger
parent6aa84464f6493c8cc4285c78b41250efe210134a (diff)
downloadqt-creator-0c42d826ae62e5b725f9a6b3288ddcb014b7bcc3.tar.gz
Debugger: Go back to normal after attempting to kill GDB
Task-number: QTCREATORBUG-13044 Change-Id: I2610136b1d5c4c2d55d13b378156d382ab6f73cc Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/debugger')
-rw-r--r--src/plugins/debugger/gdb/gdbengine.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index daebe23d04..3714547ec0 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1038,6 +1038,7 @@ void GdbEngine::commandTimeout()
showMessage(_("KILLING DEBUGGER AS REQUESTED BY USER"));
// This is an undefined state, so we just pull the emergency brake.
m_gdbProc->kill();
+ notifyEngineShutdownFailed();
} else {
showMessage(_("CONTINUE DEBUGGER AS REQUESTED BY USER"));
}
@@ -1973,6 +1974,7 @@ void GdbEngine::handleGdbExit(const GdbResponse &response)
qDebug() << (_("GDB WON'T EXIT (%1); KILLING IT").arg(msg));
showMessage(_("GDB WON'T EXIT (%1); KILLING IT").arg(msg));
m_gdbProc->kill();
+ notifyEngineShutdownFailed();
}
}