From ace57ffa9187a2feb0305d96cf2b2cf5e811e445 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Fri, 16 Sep 2016 12:42:41 +0300
Subject: [PATCH] FIXED IDEA-161330 Scheme drop-down becomes empty on deleting

---
 .../options/colors/ColorAndFontOptions.java            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
index f8907df084c4..0c76b11de507 100644
--- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
+++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
@@ -232,8 +232,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
 
   public void removeScheme(String name) {
     if (mySelectedScheme.getName().equals(name)) {
-      //noinspection HardCodedStringLiteral
-      selectScheme("Default");
+      selectDefaultScheme();
     }
 
     boolean deletedNewlyCreated = false;
@@ -248,6 +247,13 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract
     resetSchemesCombo(null);
     mySomeSchemesDeleted = mySomeSchemesDeleted || !deletedNewlyCreated;
   }
+
+
+  private void selectDefaultScheme() {
+    DefaultColorsScheme defaultScheme =
+      (DefaultColorsScheme)EditorColorsManager.getInstance().getScheme(EditorColorsManager.DEFAULT_SCHEME_NAME);
+    selectScheme(defaultScheme.getEditableCopyName());
+  }
   
   
   void resetSchemeToOriginal(@NotNull String name) {