Merge pull request #2279 from GabeMx5/master

Improved performances
arkypita · Jun 16, 2024 · bdb90b6 · bdb90b6
2 parents 340ad65 + cea12ff
commit bdb90b6
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 283 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/GrblCommand.cs b/LaserGRBL/GrblCommand.cs
@@ -90,7 +90,7 @@ private static void LoadAppropriateErrors(GrblCore.GrblVersionInfo value)
 		}
 	}
 
-	public partial class GrblCommand : ICloneable, IGrblRow
+	public partial class GrblCommand : ICloneable, IGrblRow, IDisposable
 	{
 		public class Element
 		{
@@ -474,7 +474,12 @@ public int ImageIndex
 
 		public override string ToString()
 		{ return this.mLine; }
-	}
+
+        public void Dispose()
+        {
+			LinkedDisplayList = null;
+        }
+    }
 
 	public class GrblMessage : IGrblRow
 	{