Merge branch 'ConnectPro_v1.4' into ConnectPro_v1.5

# Conflicts:
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2020-02-18 13:00:59 -05:00
2 changed files with 5 additions and 0 deletions

View File

@@ -118,6 +118,7 @@ namespace ICD.Common.Utils.Timers
Length = length;
m_Stopwatch.Reset();
m_LastHeartbeatMilliseconds = 0;
m_Stopwatch.Start();
RaiseOnIsRunningChanged();