Merge pull request #1 from Boromatic/master

Update StopWatch.cpp
2016-01-21 11:58:23 +00:00 · 2016-01-21 11:58:23 +00:00 · 6262f9ee73
parent 8cf5c58504 c5a62eefa4
commit 6262f9ee73
1 changed files with 1 additions and 1 deletions
--- a/StopWatch.cpp
+++ b/StopWatch.cpp
@ -77,7 +77,7 @@ unsigned int CStopWatch::elapsed()
 	} else {
 		long temp = -m_start.tv_nsec / 1000000L;
 		temp += (now.tv_sec - m_start.tv_sec) * 1000L;
-		temp += m_start.tv_nsec / 1000000L;
+		temp += now.tv_nsec / 1000000L;
 		return temp;
 	}
 }