From 4230c2501e8bf0f496b2ba7ef6ab66f22357a368 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Thu, 22 Jul 2010 04:21:10 +0000 Subject: [PATCH] Fix small copy-paste error in Timer.cpp git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5939 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Timer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 5f23ab31f8..039770ebd7 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -110,13 +110,13 @@ u64 Timer::GetTimeElapsed() // have to change the FPS calculation in CoreRerecording.cpp . if (m_StartTime == 0) return 1; - // Rrturn the final timer time if the timer is stopped + // Return the final timer time if the timer is stopped if (!m_Running) return (m_LastTime - m_StartTime); return (GetTimeMs() - m_StartTime); } -// Get the formattet time elapsed since the Start() +// Get the formatted time elapsed since the Start() std::string Timer::GetTimeElapsedFormatted() const { // If we have not started yet, return zero @@ -224,7 +224,7 @@ double Timer::GetDoubleTime() struct timeval t; (void)gettimeofday(&t, NULL); #endif - // Get continous timestamp + // Get continuous timestamp u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970(); // Remove a few years. We only really want enough seconds to make @@ -236,7 +236,7 @@ double Timer::GetDoubleTime() // Make a smaller integer that fits in the double u32 Seconds = (u32)TmpSeconds; #ifdef _WIN32 - double ms = t.tv_usec / 1000.0 / 1000.0; + double ms = tp.millitm / 1000.0 / 1000.0; #else double ms = t.tv_usec / 1000.0 / 1000.0; #endif