Merge remote-tracking branch 'origin/master'

This commit is contained in:
doitux
2014-01-08 09:44:38 +01:00
+1 -1
View File
@@ -72,7 +72,7 @@ public:
return *std::max_element(pingValues.begin(), pingValues.end()); return *std::max_element(pingValues.begin(), pingValues.end());
} }
unsigned AveragePing() { unsigned AveragePing() {
return std::accumulate(pingValues.begin(), pingValues.end(), 0) / (unsigned)pingValues.size(); return pingValues.empty() ? 0 : (std::accumulate(pingValues.begin(), pingValues.end(), 0) / (unsigned)pingValues.size());
} }
void StartPing() { void StartPing() {
pingTimer.start(); pingTimer.start();