Merge 7fbbc9f2b8 into 358fa1a9c0

2026-02-13 03:35:00 +00:00 · 2021-03-29 18:55:43 +00:00
1 changed files with 12 additions and 16 deletions
--- a/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
+++ b/Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
@@ -150,13 +150,13 @@ namespace PepperDash.Essentials.Core.Queues
            _delayEnabled = pacing > 0;
            _delayTime = pacing;

-            //CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
-            //{
-            //    if (programEvent != eProgramStatusEventType.Stopping)
-            //        return;
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;

-            //    Dispose(true);
-            //};
+                Dispose();
+            };
        }
        
        /// <summary>
@@ -231,8 +231,6 @@ namespace PepperDash.Essentials.Core.Queues

            if (disposing)
            {
-                Debug.Console(2, this, "Disposing..."); 
-                _queue.Clear();
                Enqueue(null);
                _worker.Join();
                _waitHandle.Close();
@@ -404,13 +402,13 @@ namespace PepperDash_Essentials_Core.Queues
            _delayEnabled = pacing > 0;
            _delayTime = pacing;

-            //CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
-            //{
-            //    if (programEvent != eProgramStatusEventType.Stopping)
-            //        return;
+            CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
+            {
+                if (programEvent != eProgramStatusEventType.Stopping)
+                    return;

-            //    Dispose(true);
-            //};
+                Dispose();
+            };
        }

        /// <summary>
@@ -479,8 +477,6 @@ namespace PepperDash_Essentials_Core.Queues

            if (disposing)
            {
-                Debug.Console(2, this, "Disposing..."); 
-                _queue.Clear();
                Enqueue(null);
                _worker.Join();
                _waitHandle.Close();