From 9763851dc517c14f36f829e8fab7f6543c096dfd Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Thu, 31 May 2018 14:23:30 +0200
Subject: [PATCH] CMake: Fix SOFT-ASSERT on cmake tool removal

Change-Id: I721e71547976ecad57ed85080c67fb28fda4f8c4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakesettingspage.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
index 2d9dc9e37d4..d6fd2dcf3ed 100644
--- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
@@ -250,6 +250,9 @@ CMakeToolTreeItem *CMakeToolItemModel::cmakeToolItem(const QModelIndex &index) c
 
 void CMakeToolItemModel::removeCMakeTool(const Core::Id &id)
 {
+    if (m_removedItems.contains(id))
+        return; // Item has already been removed in the model!
+
     CMakeToolTreeItem *treeItem = cmakeToolItem(id);
     QTC_ASSERT(treeItem, return);