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

Merge branch '2.1'

Browse Source 
Conflicts:
	tests/auto/fakevim/fakevim.pro
This commit is contained in:
Bill King
2010-10-12 10:01:27 +02:00
parent fa3bb18346 e65a180706
commit 9293453ced
44 changed files with 681 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/debuggerengine.cpp
View File

@@ -1410,15 +1410,23 @@ void DebuggerEngine::notifyEngineIll()
switch (state()) {
case InferiorRunRequested:
case InferiorRunOk:
// The engine does not look overly ill right now, so attempt to
// properly interrupt at least once. If that fails, we are on the
// shutdown path due to d->m_targetState anyways.
setState(InferiorStopRequested, true);
showMessage(_("ATTEMPT TO INTERRUPT INFERIOR"));
interruptInferior();
break;
case InferiorStopRequested:
case InferiorStopOk:
qDebug() << "FORWARDING STATE TO " << InferiorShutdownFailed;
showMessage(_("FORWARDING STATE TO InferiorShutdownFailed"));
setState(InferiorShutdownFailed, true);
d->queueShutdownEngine();
break;
default:
d->queueShutdownEngine();
break;
}
d->queueShutdownEngine();
}
void DebuggerEngine::notifyEngineSpontaneousShutdown()