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

#671 Updates to GenericQueue to resolve issues when stopping program

Browse Source
This commit is contained in:
Neil Dorin
2021-04-02 17:07:06 -06:00
parent e327d2d359
commit 037f8ed043
1 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
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>
@@ -232,9 +232,20 @@ namespace PepperDash.Essentials.Core.Queues
if (disposing) if (disposing)
{ {
Debug.Console(2, this, "Disposing..."); Debug.Console(2, this, "Disposing...");
_queue.Clear(); if (_queue != null && !_queue.Disposed)
Enqueue(null); {
_worker.Join(); _queue.Clear();
Enqueue(null);
}
//else
//{
// if (_queue == null)
// Debug.Console(2, this, "_queue is null");
// else
// Debug.Console(2, this, "_queue disposed: {0}", _queue.Disposed);
//}
//_worker.Join();
_worker.Abort();
_waitHandle.Close(); _waitHandle.Close();
} }
@@ -404,13 +415,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>
@@ -480,9 +491,20 @@ namespace PepperDash_Essentials_Core.Queues
if (disposing) if (disposing)
{ {
Debug.Console(2, this, "Disposing..."); Debug.Console(2, this, "Disposing...");
_queue.Clear(); if (_queue != null && !_queue.Disposed)
Enqueue(null); {
_worker.Join(); _queue.Clear();
Enqueue(null);
}
//else
//{
// if (_queue == null)
// Debug.Console(2, this, "_queue is null");
// else
// Debug.Console(2, this, "_queue disposed: {0}", _queue.Disposed);
//}
//_worker.Join();
_worker.Abort();
_waitHandle.Close(); _waitHandle.Close();
} }