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

Fix crash on project loading, .end() detaches

Browse Source 
Change-Id: I6bae9d04b745e27437c43b0bf6f96624be3dfd55
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Daniel Teske
2012-05-08 14:38:20 +02:00
parent cc3dd65329
commit 3e54136629
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -430,7 +430,7 @@ struct InternalNode
QString path = (*it)->fullPath; QString path = (*it)->fullPath;
QMultiMap<QString, FolderNode *>::const_iterator oldit QMultiMap<QString, FolderNode *>::const_iterator oldit
= existingFolderNodes.constFind(path); = existingFolderNodes.constFind(path);
while (oldit != existingFolderNodes.end() && oldit.key() == path) { while (oldit != existingFolderNodes.constEnd() && oldit.key() == path) {
if (oldit.value()->nodeType() == ProjectExplorer::VirtualFolderNodeType) { if (oldit.value()->nodeType() == ProjectExplorer::VirtualFolderNodeType) {
ProjectExplorer::VirtualFolderNode *vfn ProjectExplorer::VirtualFolderNode *vfn
= qobject_cast<ProjectExplorer::VirtualFolderNode *>(oldit.value()); = qobject_cast<ProjectExplorer::VirtualFolderNode *>(oldit.value());
@@ -460,7 +460,7 @@ struct InternalNode
QString path = it.value()->fullPath; QString path = it.value()->fullPath;
QMultiMap<QString, FolderNode *>::const_iterator oldit QMultiMap<QString, FolderNode *>::const_iterator oldit
= existingFolderNodes.constFind(path); = existingFolderNodes.constFind(path);
while (oldit != existingFolderNodes.end() && oldit.key() == path) { while (oldit != existingFolderNodes.constEnd() && oldit.key() == path) {
if (oldit.value()->nodeType() == ProjectExplorer::FolderNodeType) { if (oldit.value()->nodeType() == ProjectExplorer::FolderNodeType) {
found = true; found = true;
break; break;