summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/navigationwidget.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-03-15 14:52:35 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-03-15 14:52:35 +0100
commit4fa528813ef5495d018b862ae98e79e7d857900b (patch)
tree26c0fd3c6173cc800c1acb6a8cac7c26c0df5213 /src/plugins/coreplugin/navigationwidget.cpp
parent8dc563cdd8afd843749821dc61b7cc339b8db415 (diff)
downloadqt-creator-4fa528813ef5495d018b862ae98e79e7d857900b.tar.gz
Debugger: Fix exit crash in debug mode (X11).
Double deletion of debug mode widgets.
Diffstat (limited to 'src/plugins/coreplugin/navigationwidget.cpp')
-rw-r--r--src/plugins/coreplugin/navigationwidget.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 41ec4edae0..55d4dadaca 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -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();
+ }
}
}