Merge pull request #10236 from MarcelGerber/mode-class-undefined

ingorichter · ingorichter · commit e3bf0fa603b9 · 2014-12-19T17:41:50.000-08:00
Don't throw an exception if currentTheme is undefined
diff --git a/src/view/ThemeManager.js b/src/view/ThemeManager.js
@@ -265,7 +265,11 @@ define(function (require, exports, module) {
 
             var cm = editor._codeMirror;
             ThemeView.updateThemes(cm);
-            cm.setOption("addModeClass", currentTheme.addModeClass);
+
+            // currentTheme can be undefined if you reloaded without extensions
+            if (currentTheme && currentTheme.addModeClass !== undefined) {
+                cm.setOption("addModeClass", currentTheme.addModeClass);
+            }
         });
     }
 
