Merge pull request #22 from clandrew/patch-2

Use of --hex command line arg doesn't require also specifying --autoRun
Trinity-11 · May 1, 2022 · 066868c · 066868c
2 parents e2a5aff + 218b57c
commit 066868c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/Main/UI/MainWindow.cs b/Main/UI/MainWindow.cs
@@ -58,6 +58,9 @@ public partial class MainWindow : Form
 
         public MainWindow(Dictionary<string, string> context)
         {
+            bool autoRunCommandLineSpecified = false;
+            bool boardVersionCommandLineSpecified = false;
+
             if (context != null)
             {
                 if (context.ContainsKey("jumpStartAddress"))
@@ -71,6 +74,7 @@ public MainWindow(Dictionary<string, string> context)
                 if (context.ContainsKey("autoRun"))
                 {
                     autoRun = "true".Equals(context["autoRun"]);
+                    autoRunCommandLineSpecified = true;
                 }
                 if (context.ContainsKey("disabledIRQs"))
                 {
@@ -90,12 +94,16 @@ public MainWindow(Dictionary<string, string> context)
                     {
                         version = BoardVersion.RevUPlus;
                     }
+                    boardVersionCommandLineSpecified = true;
                 }
             }
             // If the user didn't specify context switches, read the ini setting
-            if (context == null)
+            if (!autoRunCommandLineSpecified)
             {
                 autoRun = Simulator.Properties.Settings.Default.Autorun;
+            }
+            if (!boardVersionCommandLineSpecified)
+            {
                 switch (Simulator.Properties.Settings.Default.BoardRevision)
                 {
                     case "B":