feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectModels: Fix crash on changing the tree in particular ways

Browse Source 
The crash is due to the project model figuring out a safe node to be the
current node, setting that. But then the DocumentManager synchronizes
the current node with the editor, thus setting the current node back.

Task-number: QTCREATORBUG-9176
Change-Id: Ia516a770dbbfd16d224fa030a8c3d1b3a40f83cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Daniel Teske
2013-04-23 13:48:52 +02:00
parent 5219faf0e2
commit d0dc68058e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -237,6 +237,7 @@ struct ProjectExplorerPluginPrivate {
KitManager *m_kitManager; KitManager *m_kitManager;
ToolChainManager *m_toolChainManager; ToolChainManager *m_toolChainManager;
bool m_shuttingDown; bool m_shuttingDown;
bool m_ignoreDocumentManagerChangedFile;
QStringList m_arguments; QStringList m_arguments;
}; };
@@ -248,7 +249,8 @@ ProjectExplorerPluginPrivate::ProjectExplorerPluginPrivate() :
m_projectsMode(0), m_projectsMode(0),
m_kitManager(0), m_kitManager(0),
m_toolChainManager(0), m_toolChainManager(0),
m_shuttingDown(false) m_shuttingDown(false),
m_ignoreDocumentManagerChangedFile(false)
{ {
} }
@@ -1413,6 +1415,8 @@ void ProjectExplorerPlugin::setCurrentFile(Project *project, const QString &file
void ProjectExplorerPlugin::setCurrentFile(const QString &filePath) void ProjectExplorerPlugin::setCurrentFile(const QString &filePath)
{ {
if (d->m_ignoreDocumentManagerChangedFile)
return;
Project *project = d->m_session->projectForFile(filePath); Project *project = d->m_session->projectForFile(filePath);
// If the file is not in any project, stay with the current project // If the file is not in any project, stay with the current project
// e.g. on opening a git diff buffer, git log buffer, we don't change the project // e.g. on opening a git diff buffer, git log buffer, we don't change the project
@@ -1826,8 +1830,10 @@ void ProjectExplorerPlugin::setCurrent(Project *project, QString filePath, Node
updateActions(); updateActions();
} }
d->m_ignoreDocumentManagerChangedFile = true;
Core::DocumentManager::setCurrentFile(filePath); Core::DocumentManager::setCurrentFile(filePath);
updateContext(); updateContext();
d->m_ignoreDocumentManagerChangedFile = false;
} }
void ProjectExplorerPlugin::updateActions() void ProjectExplorerPlugin::updateActions()