summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-11-19 11:32:43 +0100
committerKai Koehne <kai.koehne@digia.com>2013-11-19 13:57:42 +0100
commitacca83add48df2aea9dd29507083152ac1b52f0a (patch)
tree9f87bb6fdcac6e434adb7186a07e2e6e1a07000a /src/plugins
parenta60960a88fdcd9a156e2b040963cc0cee842bf1e (diff)
downloadqt-creator-acca83add48df2aea9dd29507083152ac1b52f0a.tar.gz
Fix crash on exit
Fixes a crash on exit in ~AnalyzerManager, where EditorManager::instance() might be already 0. Change-Id: Ie1d5aa5590d2dd763f5cb8c7e0a8a5e593fd2af6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/analyzerbase/analyzermanager.cpp2
-rw-r--r--src/plugins/coreplugin/editmode.cpp2
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp2
3 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp
index 6fe2f45a9f..9488196af7 100644
--- a/src/plugins/analyzerbase/analyzermanager.cpp
+++ b/src/plugins/analyzerbase/analyzermanager.cpp
@@ -107,10 +107,8 @@ public:
~AnalyzerMode()
{
- // Make sure the editor manager does not get deleted.
delete m_widget;
m_widget = 0;
- EditorManager::instance()->setParent(0);
}
};
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index 7eae044731..c2d10cce03 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -93,8 +93,6 @@ EditMode::EditMode() :
EditMode::~EditMode()
{
- // Make sure the editor manager does not get deleted
- EditorManager::instance()->setParent(0);
delete m_splitter;
}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 029950ebf0..a68df5c9c0 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -513,8 +513,6 @@ public:
~DebugMode()
{
- // Make sure the editor manager does not get deleted.
- //EditorManager::instance()->setParent(0);
delete m_widget;
}
};