Commit 4be2ebcb authored by hjk's avatar hjk
Browse files

debugger: don't let slave engine command the gui

parent 7e1d4631
......@@ -1389,11 +1389,7 @@ void DebuggerEngine::notifyEngineShutdownOk()
showMessage(_("NOTE: ENGINE SHUTDOWN OK"));
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
setState(EngineShutdownOk);
if (isSlaveEngine()) {
setState(DebuggerFinished); // WHY?
} else {
d->queueFinishDebugger();
}
}
void DebuggerEngine::notifyEngineShutdownFailed()
......@@ -1401,11 +1397,7 @@ void DebuggerEngine::notifyEngineShutdownFailed()
showMessage(_("NOTE: ENGINE SHUTDOWN FAILED"));
QTC_ASSERT(state() == EngineShutdownRequested, qDebug() << state());
setState(EngineShutdownFailed);
if (isSlaveEngine()) {
setState(DebuggerFinished); // WHY?
} else {
d->queueFinishDebugger();
}
}
void DebuggerEnginePrivate::doFinishDebugger()
......@@ -1494,7 +1486,9 @@ void DebuggerEngine::setState(DebuggerState state, bool forced)
void DebuggerEngine::updateViews()
{
// FIXME: This should not be done for slave engines.
// The slave engines are not entitled to change the view. Their wishes
// should be coordinated by their master engine.
if (isSlaveEngine())
plugin()->updateState(this);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment