forked from qt-creator/qt-creator
Debugger: Fix exit crash in debug mode (X11).
Double deletion of debug mode widgets.
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user