fix an early bug

fix a bug can cause LaserGRBL no more starting
arkypita · Aug 28, 2017 · 2f1d3aa · 2f1d3aa · arkypita · Aug 28, 2017
1 parent 4065761
commit 2f1d3aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/LaserGRBL/GrblFile.cs b/LaserGRBL/GrblFile.cs
@@ -317,7 +317,7 @@ private void ImageLine2Line(Bitmap bmp, L2LConf c)
 					if (c.pwm)
 						temp.Add(new GrblCommand("S0"));
 					else
-						list.Add(new GrblCommand(c.lOff)); //laser off
+						temp.Add(new GrblCommand(c.lOff)); //laser off
 				}
 
 				fast = seg.Fast;

diff --git a/LaserGRBL/MainForm.cs b/LaserGRBL/MainForm.cs
@@ -12,9 +12,6 @@ public MainForm()
 		{
 			InitializeComponent();
 
-			ColorScheme.CurrentScheme = (ColorScheme.Scheme)Settings.GetObject("Color Schema", ColorScheme.Scheme.BlueLaser); ;
-			RefreshColorSchema();
-
 			MMn.Renderer = new MMnRenderer();
 
 			splitContainer1.FixedPanel = FixedPanel.Panel1;
@@ -31,15 +28,16 @@ public MainForm()
 			Core = new GrblCore(this);
 			Core.MachineStatusChanged += OnMachineStatus;
 			Core.OnFileLoaded += OnFileLoaded;
-			Core.OnOverrideChange += ComPort_OnOverrideChange;
-
-			ComPort_OnOverrideChange();
+			Core.OnOverrideChange += RefreshOverride;
 
 			PreviewForm.SetCore(Core);
 			ConnectionForm.SetCore(Core);
 			JogForm.SetCore(Core);
 
 			GitHub.NewVersion += GitHub_NewVersion;
+
+			ColorScheme.CurrentScheme = (ColorScheme.Scheme)Settings.GetObject("Color Schema", ColorScheme.Scheme.BlueLaser); ;
+			RefreshColorSchema(); //include RefreshOverride();
 		}
 
 		private void RefreshColorSchema()
@@ -52,7 +50,7 @@ private void RefreshColorSchema()
 			hackerToolStripMenuItem.Checked = ColorScheme.CurrentScheme == ColorScheme.Scheme.Hacker;
 			ConnectionForm.Invalidate();
 			PreviewForm.Invalidate();
-			ComPort_OnOverrideChange();
+			RefreshOverride();
 		}
 
 		void GitHub_NewVersion(Version current, Version latest, string name, string url)
@@ -234,7 +232,7 @@ private void MnGrblReset_Click(object sender, EventArgs e)
 			Core.GrblReset();
 		}
 
-		void ComPort_OnOverrideChange()
+		void RefreshOverride()
 		{
 			SuspendLayout();
 			TTOvG0.Text = string.Format("G0 [{0:0.00}x]", Core.OverrideG0 / 100.0);