From f36c1752406b6e85da2c92a4f946b98c587efd7a Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Tue, 21 Jul 2015 11:55:58 +0200
Subject: [PATCH] KitManager: Only setup sdk kits if we keep them

Change-Id: Iff56c8114590f99c70fbee31699ced2c9786dee7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
 src/plugins/projectexplorer/kitmanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index a1ce7feba44..dd73605d4b7 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -148,7 +148,6 @@ void KitManager::restoreKits()
             k->setAutoDetected(true);
             k->setSdkProvided(true);
             k->makeSticky();
-            k->setup();
         }
 
         // SDK kits are always considered to be up for validation since they might have been
@@ -191,6 +190,8 @@ void KitManager::restoreKits()
                 break;
             }
         }
+        if (toStore == current)
+            toStore->setup();
         addKit(toStore);
     }