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

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

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2020-02-18 12:59:18 -05:00
parent 311bf683e0 69eb4b3d34
commit a53ad74811
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ICD.Common.Utils/Properties/AssemblyInfo.cs
View File

@@ -3,5 +3,5 @@ using System.Reflection;
[assembly: AssemblyTitle("ICD.Common.Utils")]
[assembly: AssemblyCompany("ICD Systems")]
[assembly: AssemblyProduct("ICD.Common.Utils")]
[assembly: AssemblyCopyright("Copyright © ICD Systems 2019")]
[assembly: AssemblyCopyright("Copyright © ICD Systems 2020")]
[assembly: AssemblyVersion("9.7.0.0")]

1
ICD.Common.Utils/Timers/IcdTimer.cs
View File

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