From c5cab25c2e28b28dc986183483039ff2457d799d Mon Sep 17 00:00:00 2001
From: Sergey Savenko <sergey.savenko@jetbrains.com>
Date: Mon, 1 Dec 2014 21:22:32 +0300
Subject: [PATCH] EditorColorsManager: fire change events both upon scheme
 change and modification

---
 .../colors/impl/EditorColorsManagerImpl.java       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
index 6bf9d7d5ea6c..a8e5c4c4443a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
@@ -228,19 +228,17 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
 
   @Override
   public void setGlobalScheme(@Nullable EditorColorsScheme scheme) {
-    if (setGlobalSchemeInner(scheme)) {
-      LafManager.getInstance().updateUI();
-      EditorFactory.getInstance().refreshAllEditors();
+    setGlobalSchemeInner(scheme);
 
-      fireChanges(scheme);
-    }
+    LafManager.getInstance().updateUI();
+    EditorFactory.getInstance().refreshAllEditors();
+
+    fireChanges(scheme);
   }
 
-  private boolean setGlobalSchemeInner(@Nullable EditorColorsScheme scheme) {
+  private void setGlobalSchemeInner(@Nullable EditorColorsScheme scheme) {
     String newValue = scheme == null ? getDefaultScheme().getName() : scheme.getName();
-    EditorColorsScheme oldValue = mySchemesManager.getCurrentScheme();
     mySchemesManager.setCurrentSchemeName(newValue);
-    return oldValue != null && !Comparing.equal(newValue, oldValue.getName());
   }
 
   @NotNull