From 97990b2cf774ca6023984e9559f781ea4f1e91b5 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 31 Oct 2016 12:55:35 +0100
Subject: [PATCH] preserve current scheme on reload using pending scheme name

---
 platform/configuration-store-impl/src/SchemeManagerImpl.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/configuration-store-impl/src/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
index 66415f2257e4..bec58cd6e805 100644
--- a/platform/configuration-store-impl/src/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
@@ -346,8 +346,11 @@ class SchemeManagerImpl<T : Scheme, MUTABLE_SCHEME : T>(val fileSpec: String,
         continue
       }
 
-      if (scheme === currentScheme) {
-        currentScheme = null
+      currentScheme?.let {
+        if (scheme === it) {
+          currentPendingSchemeName = it.name
+          currentScheme = null
+        }
       }
 
       iterator.remove()