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

Kit: Fix possible crash

Browse Source 
Fix crash in KitOptionsPage related to setting the default kit

Task-number: QTCREATORBUG-14053
Change-Id: Icf10b2596afa0a3b871aca0685a6f7d3a59ab022
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-03-02 15:48:37 +01:00
parent a064280ca3
commit 9548e7adad
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,6 +246,9 @@ void KitModel::markForRemoval(Kit *k)
setDefaultNode(static_cast<KitNode *>(newDefault)); setDefaultNode(static_cast<KitNode *>(newDefault));
} }
if (node == m_defaultNode)
setDefaultNode(findItemAtLevel<KitNode *>(2, [node](KitNode *kn) { return kn != node; }));
removeItem(node); removeItem(node);
if (node->widget->configures(0)) if (node->widget->configures(0))
delete node; delete node;
@@ -353,8 +356,9 @@ void KitModel::removeKit(Kit *k)
} }
} }
if (m_defaultNode == node) if (node == m_defaultNode)
m_defaultNode = 0; setDefaultNode(findItemAtLevel<KitNode *>(2, [node](KitNode *kn) { return kn != node; }));
removeItem(node); removeItem(node);
delete node; delete node;