Cleanup

Author: sinai-dev

src/UI/CSConsole/ConsoleController.cs

@@ -53,30 +53,20 @@ public static class ConsoleController
 
         public static void Init()
         {
+            // Make sure console is supported on this platform
             try
             {
                 ResetConsole(false);
                 // ensure the compiler is supported (if this fails then SRE is probably stubbed)
                 Evaluator.Compile("0 == 0");
-
-                if (!Directory.Exists(ScriptsFolder))
-                    Directory.CreateDirectory(ScriptsFolder);
-
-                var startupPath = Path.Combine(ScriptsFolder, "startup.cs");
-                if (File.Exists(startupPath))
-                {
-                    ExplorerCore.Log($"Executing startup script from '{startupPath}'...");
-                    var text = File.ReadAllText(startupPath);
-                    Input.Text = text;
-                    Evaluate();
-                }
             }
             catch (Exception ex)
             {
                 DisableConsole(ex);
                 return;
             }
 
+            // Setup console
             Lexer = new LexerBuilder();
             Completer = new CSAutoCompleter();
 
@@ -90,6 +80,26 @@ public static void Init()
             Panel.OnAutoIndentToggled += OnToggleAutoIndent;
             Panel.OnCtrlRToggled += OnToggleCtrlRShortcut;
             Panel.OnSuggestionsToggled += OnToggleSuggestions;
+
+            // Run startup script
+            try
+            {
+                if (!Directory.Exists(ScriptsFolder))
+                    Directory.CreateDirectory(ScriptsFolder);
+
+                var startupPath = Path.Combine(ScriptsFolder, "startup.cs");
+                if (File.Exists(startupPath))
+                {
+                    ExplorerCore.Log($"Executing startup script from '{startupPath}'...");
+                    var text = File.ReadAllText(startupPath);
+                    Input.Text = text;
+                    Evaluate();
+                }
+            }
+            catch (Exception ex)
+            {
+                ExplorerCore.LogWarning($"Exception executing startup script: {ex}");
+            }
         }