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

Debugger: Fix exit crash.

Browse Source 
Make sure DebuggerRunner::finished() is always connected to
handleFinished() (even for subclassed DebuggerRunners). Add
some more debugging information.
This commit is contained in:
Friedemann Kleint
2010-08-24 16:22:21 +02:00
parent 616a9b13f0
commit ad9ff8ed74
3 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -189,7 +189,6 @@ DebuggerRunControl *DebuggerRunControlFactory::create(
delete runControl;
return 0;
}
connect(runControl, SIGNAL(finished()), runControl, SLOT(handleFinished()));
return runControl;
}
@@ -209,13 +208,14 @@ QWidget *DebuggerRunControlFactory::createConfigurationWidget
////////////////////////////////////////////////////////////////////////
DebuggerRunControl::DebuggerRunControl(RunConfiguration *runConfiguration,
DebuggerEngineType enabledEngines, const DebuggerStartParameters &sp)
: RunControl(runConfiguration, ProjectExplorer::Constants::DEBUGMODE),
m_myRunConfiguration(runConfiguration)
DebuggerEngineType enabledEngines, const DebuggerStartParameters &sp) :
RunControl(runConfiguration, ProjectExplorer::Constants::DEBUGMODE),
m_engine(0),
m_myRunConfiguration(runConfiguration),
m_running(false),
m_enabledEngines(enabledEngines)
{
m_running = false;
m_enabledEngines = enabledEngines;
m_engine = 0;
connect(this, SIGNAL(finished()), this, SLOT(handleFinished()));
createEngine(sp);
}
@@ -336,9 +336,6 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &sp)
{
// Figure out engine according to toolchain, executable, attach or default.
DebuggerEngineType engineType = NoEngineType;
QString errorMessage;
QString settingsIdHint;
bool isQmlExecutable = sp.executable.endsWith(_("qmlviewer")) || sp.executable.endsWith(_("qmlobserver"));
#ifdef Q_OS_MAC
isQmlExecutable = sp.executable.endsWith(_("QMLViewer.app")) || sp.executable.endsWith(_("QMLObserver.app"));
@@ -476,9 +473,9 @@ void DebuggerRunControl::start()
plugin()->showMessage(message, StatusBar);
plugin()->showMessage(DebuggerSettings::instance()->dump(), LogDebug);
plugin()->runControlStarted(this);
engine()->startDebugger(this);
m_running = true;
plugin()->runControlStarted(this);
emit started();
}