grblcore now calls grblcommand dispose before clearing queues

opengl thread has lowest priority to free resources for communication threads
arkypita · Jun 16, 2024 · cea12ff · cea12ff
1 parent c81d63e
commit cea12ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/LaserGRBL/Core/GrblCore.cs b/LaserGRBL/Core/GrblCore.cs
@@ -1211,7 +1211,7 @@ public void AbortProgram()
 
 					lock (this)
 					{
-						mQueue.Clear(); //flush the queue of item to send
+						ClearQueue(mQueue); //flush the queue of item to send
 						mQueue.Enqueue(new GrblCommand("M5")); //shut down laser
 					}
 				}
@@ -2679,10 +2679,19 @@ private void OnProgramEnd()
 		private bool InPause
 		{ get { return mMachineStatus != MacStatus.Run && mMachineStatus != MacStatus.Idle; } }
 
-		private void ClearQueue(bool sent)
+		private void ClearQueue(Queue<GrblCommand> queue)
+        {
+			foreach (GrblCommand command in queue)
+			{
+				command.Dispose();
+			}
+			queue.Clear();
+        }
+
+        private void ClearQueue(bool sent)
 		{
-			mQueue.Clear();
-			mPending.Clear();
+            ClearQueue(mQueue);
+            ClearQueue(mPending);
 			if (sent) mSent.Clear();
 			mRetryQueue = null;
 		}

diff --git a/LaserGRBL/UserControls/GrblPanel3D.cs b/LaserGRBL/UserControls/GrblPanel3D.cs
@@ -7,8 +7,6 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.Net.Mail;
-using System.Runtime.Remoting.Messaging;
 using System.Threading;
 using System.Windows.Forms;
 using static LaserGRBL.ProgramRange;
@@ -138,7 +136,7 @@ public GrblPanel3D()
 			mGrid = new Grid3D();
 
 			OnColorChange();
-			TH = new Tools.ThreadObject(DrawScene, 10, true, "OpenGL", InitializeOpenGL, ThreadPriority.Normal, ApartmentState.STA);
+			TH = new Tools.ThreadObject(DrawScene, 10, true, "OpenGL", InitializeOpenGL, ThreadPriority.Lowest, ApartmentState.STA);
 			TH.Start();
 		}