aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-06-05 09:49:46 -0600
committerAShifter <[email protected]>2017-06-05 09:49:46 -0600
commit61c906e596145bbedd60725c6dcee68c34a27907 (patch)
treecd7a00d501affe96028bfb21a8dec90c2ee63f2c /ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs
parent66ea2cf2fdeeaa025bd22961a0400423233c505d (diff)
parent3e11eca70481841b6e2f2253d667944779cfd5fb (diff)
downloadshiftos_thereturn-61c906e596145bbedd60725c6dcee68c34a27907.tar.gz
shiftos_thereturn-61c906e596145bbedd60725c6dcee68c34a27907.tar.bz2
shiftos_thereturn-61c906e596145bbedd60725c6dcee68c34a27907.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs')
-rw-r--r--ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs b/ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs
index d38cdc3..b0dc552 100644
--- a/ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs
+++ b/ShiftOS.WinForms/DesktopWidgets/HeartbeatWidget.cs
@@ -24,13 +24,13 @@ namespace ShiftOS.WinForms.DesktopWidgets
if(ts != ServerManager.DigitalSocietyPing)
{
ts = ServerManager.DigitalSocietyPing;
- lbheartbeat.Text = "Server ping: " + ts.ToString();
+ lbheartbeat.Text = "Server ping: " + ts.ToString() + " MS";
}
};
}
//Fun fact. I misspelled this as "TimeSpam."
- TimeSpan ts;
+ long ts = 0;
public void OnSkinLoad()
{