From 4fa528813ef5495d018b862ae98e79e7d857900b Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 15 Mar 2011 14:52:35 +0100
Subject: Debugger: Fix exit crash in debug mode (X11).

Double deletion of debug mode widgets.
---
 src/plugins/coreplugin/navigationwidget.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/plugins/coreplugin/navigationwidget.cpp')

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();
+        }
     }
 }
 
-- 
cgit v1.2.1