diff options
| author | hjk <hjk@qt.io> | 2017-09-19 12:31:19 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2017-09-21 12:46:13 +0000 |
| commit | 526e217ce9cfb1f22ec9bbf0e9844803b72b4911 (patch) | |
| tree | e2c057610a13b8a555213070cf6b1954a22f1de9 /src/plugins/debugger/cdb/cdbengine.cpp | |
| parent | ed2ae5fa81adb554e0c74d513edbcd99ee377a2c (diff) | |
| download | qt-creator-526e217ce9cfb1f22ec9bbf0e9844803b72b4911.tar.gz | |
Debugger: Centralize abort handling
... and apply even more force on the second trying by forcing
ramp down of the runControl itself instead of hoping that it
would pick up hints.
Change-Id: I9d0f4130cb9a137b91c9fa81c3d255f236f98be0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/debugger/cdb/cdbengine.cpp')
| -rw-r--r-- | src/plugins/debugger/cdb/cdbengine.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 9c52ad0b9e..6d64a7e440 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -840,17 +840,9 @@ void CdbEngine::shutdownEngine() } } -void CdbEngine::abortDebugger() +void CdbEngine::abortDebuggerProcess() { - if (isDying()) { - // We already tried. Try harder. - showMessage("ABORTING DEBUGGER. SECOND TIME."); - m_process.kill(); - } else { - // Be friendly the first time. This will change targetState(). - showMessage("ABORTING DEBUGGER. FIRST TIME."); - quitDebugger(); - } + m_process.kill(); } void CdbEngine::processFinished() |