debugger: allow state transition from DebuggerInferiorRunning to

DebuggerInferiorStopped without going through DebuggerInferiorStopRequested

debugger: allow state transition from DebuggerInferiorRunning to
DebuggerInferiorStopped without going through DebuggerInferiorStopRequested
fff7187f · hjk · 8e0fb8ba · fff7187f
Commit fff7187f authored Mar 17, 2009 by hjk
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/plugins/debugger/debuggermanager.cpp src/plugins/debugger/debuggermanager.cpp +2 -2

No files found.
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -1195,10 +1195,11 @@ static bool isAllowedTransition(int from, int to)
 {
    return (from == -1)
      || (from == DebuggerProcessNotReady && to == DebuggerProcessStartingUp)
-      || (from == DebuggerProcessStartingUp && to == DebuggerInferiorStopped)
+      //|| (from == DebuggerProcessStartingUp && to == DebuggerInferiorStopped)
      || (from == DebuggerInferiorStopped && to == DebuggerInferiorRunningRequested)
      || (from == DebuggerInferiorRunningRequested && to == DebuggerInferiorRunning)
      || (from == DebuggerInferiorRunning && to == DebuggerInferiorStopRequested)
+      || (from == DebuggerInferiorRunning && to == DebuggerInferiorStopped)
      || (from == DebuggerInferiorStopRequested && to == DebuggerInferiorStopped)
      || (to == DebuggerProcessNotReady);  
 }
@@ -1214,7 +1215,6 @@ void DebuggerManager::setStatus(int status)
    if (!isAllowedTransition(m_status, status))
        qDebug() << "UNEXPECTED TRANSITION:  " << m_status << status;

-
    m_status = status;

    const bool started = status == DebuggerInferiorRunning