Commit 4fa52881 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger: Fix exit crash in debug mode (X11).

Double deletion of debug mode widgets.
parent 8dc563cd
......@@ -79,8 +79,10 @@ NavigationWidgetPlaceHolder::NavigationWidgetPlaceHolder(Core::IMode *mode, QWid
NavigationWidgetPlaceHolder::~NavigationWidgetPlaceHolder()
{
if (m_current == this) {
NavigationWidget::instance()->setParent(0);
NavigationWidget::instance()->hide();
if (NavigationWidget *nw = NavigationWidget::instance()) {
nw->setParent(0);
nw->hide();
}
}
}
......
......@@ -507,6 +507,7 @@ QWidget *DebuggerMainWindow::createContents(IMode *mode)
splitter->addWidget(mainWindowSplitter);
splitter->setStretchFactor(0, 0);
splitter->setStretchFactor(1, 1);
splitter->setObjectName(QLatin1String("DebugModeWidget"));
return splitter;
}
......
......@@ -1117,8 +1117,7 @@ DebuggerPluginPrivate::~DebuggerPluginPrivate()
delete m_debuggerSettings;
m_debuggerSettings = 0;
delete m_mainWindow;
m_mainWindow = 0;
// Mainwindow will be deleted by debug mode.
delete m_snapshotHandler;
m_snapshotHandler = 0;
......
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