mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-01-29 09:32:42 +00:00
Merge remote-tracking branch 'upstream/master' into ppu_llvm_recompiler
This commit is contained in:
commit
18251b784f
@ -165,6 +165,10 @@ void Rpcs3App::Exit()
|
|||||||
Ini.Save();
|
Ini.Save();
|
||||||
|
|
||||||
wxApp::Exit();
|
wxApp::Exit();
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
timeEndPeriod(1);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void Rpcs3App::SendDbgCommand(DbgCommand id, CPUThread* thr)
|
void Rpcs3App::SendDbgCommand(DbgCommand id, CPUThread* thr)
|
||||||
@ -176,6 +180,10 @@ void Rpcs3App::SendDbgCommand(DbgCommand id, CPUThread* thr)
|
|||||||
|
|
||||||
Rpcs3App::Rpcs3App()
|
Rpcs3App::Rpcs3App()
|
||||||
{
|
{
|
||||||
|
#ifdef _WIN32
|
||||||
|
timeBeginPeriod(1);
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__unix__) && !defined(__APPLE__)
|
#if defined(__unix__) && !defined(__APPLE__)
|
||||||
XInitThreads();
|
XInitThreads();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user