icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-15 04:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.3

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2019-06-14 16:54:12 -04:00
parent b680bab67a b915401109
commit d3d812265e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ICD.Common.Utils/Timers/SafeTimer.cs
View File

@@ -67,8 +67,8 @@ namespace ICD.Common.Utils.Timers
/// <returns></returns>
public static SafeTimer Stopped(Action callback)
{
// Some arbitrarily large number that shouldn't timeout before we call stop.
SafeTimer output = new SafeTimer(callback, 100 * 1000, 100 * 1000);
//No due time or repeat period on a stopped timer
SafeTimer output = new SafeTimer(callback, -1, -1);
output.Stop();
return output;
}