diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2014-12-18 11:03:36 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-12-18 13:55:16 +0100 |
| commit | 7b226fffd767f917350029ee46fe9535310f5279 (patch) | |
| tree | 8aa0fb1437850239fdda2b8526c4233fbffc76f2 /src/plugins/projectexplorer/projecttree.h | |
| parent | bd70ae32552b3cda20989263b6f17448e0da6252 (diff) | |
ProjectExplorer: Hotfix for crash on session switch.
In ProjectTree::update() as well as in
CurrentProjectFilter::currentProjectChanged(), there are crashes due to
accesses to a pointer to a deleted project. Wrap the pointer in a
QPointer to prevent this.
May or may not be the correct long-term solution, but does fix the
crash.
Change-Id: I4182a4753578cc4765b9120a36cd8701d07c94c1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer/projecttree.h')
| -rw-r--r-- | src/plugins/projectexplorer/projecttree.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/projecttree.h b/src/plugins/projectexplorer/projecttree.h index 8a7cc4f54c..1365dd8eca 100644 --- a/src/plugins/projectexplorer/projecttree.h +++ b/src/plugins/projectexplorer/projecttree.h @@ -35,6 +35,8 @@ #include <coreplugin/icontext.h> +#include <QPointer> + namespace ProjectExplorer { class FileNode; class FolderNode; @@ -92,7 +94,7 @@ private: static ProjectTree *s_instance; QList<Internal::ProjectTreeWidget *> m_projectTreeWidgets; Node *m_currentNode; - Project *m_currentProject; + QPointer<Project> m_currentProject; bool m_resetCurrentNodeFolder; bool m_resetCurrentNodeFile; bool m_resetCurrentNodeProject; |