summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-12-06 10:23:51 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-12-06 10:23:51 +0100
commit6a9b6def563637160eb5cb1588952fd1b5cf3175 (patch)
treeea1662d251326d1f5d8311be9cdd8e4dba692619 /src/plugins/coreplugin
parent688f5d594105bf6e92ca6b78afb9e9be015dbc52 (diff)
downloadqt-creator-6a9b6def563637160eb5cb1588952fd1b5cf3175.tar.gz
Debugger: Fix exit crash in Debug-Mode.
Acked-By: hjk
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r--src/plugins/coreplugin/outputpane.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 38b08abf40..671d93e55a 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();
+ }
}
}