Merge 2feec62052 into 3a4737b6f6

Removes explicit call to dispose when program stops. Clears queue in dispose
#671 switches to private Dispose() on program stop
2026-02-07 00:35:07 +00:00 · 2021-03-31 22:35:43 +00:00 · 2021-03-31 16:35:33 -06:00 · 2021-03-30 15:56:05 -06:00 · 2021-03-29 13:17:51 -06:00
1 changed files with 16 additions and 12 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();
-            };
+            //    Dispose(true);
+            //};
        }
        
        /// <summary>
@@ -231,6 +231,8 @@ namespace PepperDash.Essentials.Core.Queues

            if (disposing)
            {
+                Debug.Console(2, this, "Disposing..."); 
+                _queue.Clear();
                Enqueue(null);
                _worker.Join();
                _waitHandle.Close();
@@ -402,13 +404,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();
-            };
+            //    Dispose(true);
+            //};
        }

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

            if (disposing)
            {
+                Debug.Console(2, this, "Disposing..."); 
+                _queue.Clear();
                Enqueue(null);
                _worker.Join();
                _waitHandle.Close();
Author	SHA1	Message	Date
Neil Dorin	ce7f458239	Merge `2feec62052` into `3a4737b6f6`	2021-03-31 22:35:43 +00:00
Neil Dorin	2feec62052	Removes explicit call to dispose when program stops. Clears queue in dispose	2021-03-31 16:35:33 -06:00
Neil Dorin	955d68b3f3	#671 switches to private Dispose() on program stop	2021-03-30 15:56:05 -06:00
Andrew Welker	185f03065e	Merge pull request #669 from PepperDash/hotfix/dm-routing-issues Fix LinkToApi methods for chassis to use ExecuteNumericSwitch	2021-03-29 13:17:51 -06:00