diff --git a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 536f149ea996..ead03c08ab41 100644 --- a/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/platform-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -20,6 +20,7 @@ import com.intellij.openapi.extensions.BaseExtensionPointName; import com.intellij.openapi.options.*; import com.intellij.openapi.options.colors.*; import com.intellij.openapi.options.ex.Settings; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.util.*; @@ -539,6 +540,9 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract try { initDescriptions(page, descriptions, scheme); } + catch (ProcessCanceledException e) { + throw e; + } catch (Exception e) { LOG.error(e); } @@ -547,6 +551,9 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract try { initDescriptions(provider, descriptions, scheme); } + catch (ProcessCanceledException e) { + throw e; + } catch (Exception e) { LOG.error(e); }