From 34e8b88c8c089a3295eb3b3039f249a3bc957b55 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 15 Mar 2009 05:34:35 +0000 Subject: [PATCH] fix Timer::GetTimeFormatted git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2659 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Timer.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/Src/Timer.cpp b/Source/Core/Common/Src/Timer.cpp index 903133640f..50a928ea8c 100644 --- a/Source/Core/Common/Src/Timer.cpp +++ b/Source/Core/Common/Src/Timer.cpp @@ -193,12 +193,20 @@ u64 Timer::GetLocalTimeSinceJan1970() // Return the current time formatted as Minutes:Seconds:Milliseconds in the form 00:00:000 std::string Timer::GetTimeFormatted() { + time_t sysTime; + struct tm * gmTime; + char formattedTime[13]; + + time(&sysTime); + gmTime = localtime(&sysTime); + strftime(formattedTime, 6, "%M:%S", gmTime); + + // Now tack on the milliseconds struct timeb tp; (void)::ftime(&tp); - char temp[32]; - sprintf(temp, "%02ld:%02ld:%03i", tp.time/60, tp.time%60, tp.millitm); + sprintf(formattedTime, "%s:%03i", formattedTime, tp.millitm); - return std::string(temp); + return std::string(formattedTime); } /////////////////////////////////////