Merge remote-tracking branch 'upstream/master' into ppu_llvm_recompiler

This commit is contained in:
S Gopal Rajagopal 2014-11-10 11:30:44 +05:30
commit 18251b784f

View File

@ -165,6 +165,10 @@ void Rpcs3App::Exit()
Ini.Save();
wxApp::Exit();
#ifdef _WIN32
timeEndPeriod(1);
#endif
}
void Rpcs3App::SendDbgCommand(DbgCommand id, CPUThread* thr)
@ -176,6 +180,10 @@ void Rpcs3App::SendDbgCommand(DbgCommand id, CPUThread* thr)
Rpcs3App::Rpcs3App()
{
#ifdef _WIN32
timeBeginPeriod(1);
#endif
#if defined(__unix__) && !defined(__APPLE__)
XInitThreads();
#endif