From 6a9b6def563637160eb5cb1588952fd1b5cf3175 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 6 Dec 2010 10:23:51 +0100
Subject: [PATCH] Debugger: Fix exit crash in Debug-Mode.
Acked-By: hjk
---
src/plugins/coreplugin/outputpane.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 38b08abf403..671d93e55a8 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -74,8 +74,11 @@ OutputPanePlaceHolder::OutputPanePlaceHolder(Core::IMode *mode, QSplitter* paren
OutputPanePlaceHolder::~OutputPanePlaceHolder()
{
if (d->m_current == this) {
- Internal::OutputPaneManager::instance()->setParent(0);
- Internal::OutputPaneManager::instance()->hide();
+ // FIXME: Prevent exit crash in debug mode.
+ if (Internal::OutputPaneManager *om = Internal::OutputPaneManager::instance()) {
+ om->setParent(0);
+ om->hide();
+ }
}
}
--
GitLab