real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions 2 Activity

Fix profiler shutdown order

Browse Source 
This was SVN commit r10483.
This commit is contained in:
Ykkrosh 2011-11-09 00:09:19 +00:00
parent d9f3e329f0
commit cb27a680bf
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/main.cpp
View File

@ -503,5 +503,8 @@ int main(int argc, char* argv[])
RunGameOrAtlas(argc, const_cast<const char**>(argv)); RunGameOrAtlas(argc, const_cast<const char**>(argv));
// Shut down profiler initialised by EarlyInit
g_Profiler2.Shutdown();
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

5
source/ps/GameSetup/GameSetup.cpp
View File

@ -698,8 +698,6 @@ void Shutdown(int UNUSED(flags))
wmi_Shutdown(); wmi_Shutdown();
TIMER_END(L"shutdown wmi"); TIMER_END(L"shutdown wmi");
#endif #endif
g_Profiler2.Shutdown();
} }
#if OS_UNIX #if OS_UNIX
@ -779,7 +777,8 @@ void EarlyInit()
timer_LatchStartTime(); timer_LatchStartTime();
// initialise profiler early so it can profile startup // initialise profiler early so it can profile startup,
// but only after LatchStartTime
g_Profiler2.Initialise(); g_Profiler2.Initialise();
FixLocales(); FixLocales();