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

debugger: fix crash on exit

Browse Source 
Order matters.
This commit is contained in:
hjk
2010-12-08 17:54:16 +01:00
parent 562d0c5fbd
commit 2e1cad3b6d
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -507,10 +507,14 @@ static DebuggerEngine *dummyEngine()
class DebugMode : public IMode
{
public:
DebugMode() : m_widget(0) { setObjectName(QLatin1String("DebugMode")); }
DebugMode() : m_widget(0) { setObjectName(QLatin1String("DebugMode")); }
// Make sure the editor manager does not get deleted.
~DebugMode() { EditorManager::instance()->setParent(0); }
~DebugMode()
{
// Make sure the editor manager does not get deleted.
//EditorManager::instance()->setParent(0);
delete m_widget;
}
// IMode
QString displayName() const { return DebuggerPlugin::tr("Debug"); }
@@ -1420,16 +1424,16 @@ DebuggerPluginPrivate::~DebuggerPluginPrivate()
delete m_debuggerSettings;
m_debuggerSettings = 0;
m_plugin->removeObject(theDebuggerCore->m_debugMode);
delete m_debugMode;
m_debugMode = 0;
m_plugin->removeObject(m_mainWindow);
delete m_mainWindow;
m_mainWindow = 0;
delete m_snapshotHandler;
m_snapshotHandler = 0;
m_plugin->removeObject(theDebuggerCore->m_debugMode);
delete m_debugMode;
m_debugMode = 0;
}
DebuggerCore *debuggerCore()
@@ -1451,7 +1455,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
// Cpp/Qml ui setup
m_mainWindow = new DebuggerMainWindow;
ExtensionSystem::PluginManager::instance()->addObject(m_mainWindow);
m_plugin->addObject(m_mainWindow);
return true;
}