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

Debugger: Fix cdb switching back from stopper thread

Browse Source 
Amends 9f9c72302f.

Change-Id: If97ca13de30fa4d24deddd58177f55e2c71010a8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2018-08-30 12:30:52 +02:00
parent b23bb73bee
commit 0c58248894
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1804,7 +1804,7 @@ void CdbEngine::processStop(const GdbMi &stopReason, bool conditionalBreakPointT
// Further examine stop and report to user
QString message;
QString exceptionBoxMessage;
Thread forcedThread;
bool forcedThread = false;
const unsigned stopFlags = examineStopReason(stopReason, &message, &exceptionBoxMessage,
conditionalBreakPointTriggered);
m_stopMode = NoStopRequested;
@@ -1842,7 +1842,7 @@ void CdbEngine::processStop(const GdbMi &stopReason, bool conditionalBreakPointT
if (stopFlags & StopInArtificialThread) {
showMessage(tr("Switching to main thread..."), LogMisc);
runCommand({"~0 s", NoFlags});
forcedThread = Thread();
forcedThread = true;
// Re-fetch stack again.
reloadFullStack();
} else {
@@ -1868,7 +1868,7 @@ void CdbEngine::processStop(const GdbMi &stopReason, bool conditionalBreakPointT
if (threads.isValid()) {
threadsHandler()->setThreads(threads);
if (forcedThread)
threadsHandler()->setCurrentThread(forcedThread);
threadsHandler()->setCurrentThread(threadsHandler()->threadForId("0"));
} else {
showMessage(stopReason["threaderror"].data(), LogError);
}