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

Debugger[CDB]: Do not detach on shutdown in case of console.

Browse Source 
Do not use effectiveStartMode in shutdown.

Change-Id: Ia300f511f335de4a7d9d7c07e2080cecc91042e4
Reviewed-on: http://codereview.qt.nokia.com/680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2011-06-23 16:43:30 +02:00
parent f3e22da48c
commit a68aff709f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -866,8 +866,8 @@ void CdbEngine::shutdownInferior()
return;
}
if (m_accessible) {
if (m_effectiveStartMode == AttachExternal || m_effectiveStartMode == AttachCrashedExternal)
if (m_accessible) { // except console.
if (startParameters().startMode == AttachExternal || startParameters().startMode == AttachCrashedExternal)
detachDebugger();
STATE_DEBUG(state(), Q_FUNC_INFO, __LINE__, "notifyInferiorShutdownOk")
notifyInferiorShutdownOk();
@@ -915,8 +915,8 @@ void CdbEngine::shutdownEngine()
m_ignoreCdbOutput = true;
// Go for kill if there are commands pending.
if (m_accessible && !commandsPending()) {
// detach: Wait for debugger to finish.
if (m_effectiveStartMode == AttachExternal)
// detach (except console): Wait for debugger to finish.
if (startParameters().startMode == AttachExternal || startParameters().startMode == AttachCrashedExternal)
detachDebugger();
// Remote requires a bit more force to quit.
if (m_effectiveStartMode == AttachToRemote) {