pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-13 19:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes explicit call to dispose when program stops. Clears queue in dispose

Browse Source
This commit is contained in:
Neil Dorin
2021-03-31 16:35:33 -06:00
parent 955d68b3f3
commit 2feec62052
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
essentials-framework/Essentials Core/PepperDashEssentialsBase/Queues/GenericQueue.cs
View File

@@ -150,13 +150,13 @@ namespace PepperDash.Essentials.Core.Queues
_delayEnabled = pacing > 0; _delayEnabled = pacing > 0;
_delayTime = pacing; _delayTime = pacing;
CrestronEnvironment.ProgramStatusEventHandler += programEvent => //CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
{ //{
if (programEvent != eProgramStatusEventType.Stopping) // if (programEvent != eProgramStatusEventType.Stopping)
return; // return;
Dispose(true); // Dispose(true);
}; //};
} }
/// <summary> /// <summary>
@@ -231,6 +231,8 @@ namespace PepperDash.Essentials.Core.Queues
if (disposing) if (disposing)
{ {
Debug.Console(2, this, "Disposing...");
_queue.Clear();
Enqueue(null); Enqueue(null);
_worker.Join(); _worker.Join();
_waitHandle.Close(); _waitHandle.Close();
@@ -402,13 +404,13 @@ namespace PepperDash_Essentials_Core.Queues
_delayEnabled = pacing > 0; _delayEnabled = pacing > 0;
_delayTime = pacing; _delayTime = pacing;
CrestronEnvironment.ProgramStatusEventHandler += programEvent => //CrestronEnvironment.ProgramStatusEventHandler += programEvent =>
{ //{
if (programEvent != eProgramStatusEventType.Stopping) // if (programEvent != eProgramStatusEventType.Stopping)
return; // return;
Dispose(true); // Dispose(true);
}; //};
} }
/// <summary> /// <summary>
@@ -477,6 +479,8 @@ namespace PepperDash_Essentials_Core.Queues
if (disposing) if (disposing)
{ {
Debug.Console(2, this, "Disposing...");
_queue.Clear();
Enqueue(null); Enqueue(null);
_worker.Join(); _worker.Join();
_waitHandle.Close(); _waitHandle.Close();