RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #70 from Nekotekina/rpcs3

Browse source 
and conflicts fixed.
This commit is contained in:
Alexandro Sánchez Bach 2014-02-13 12:13:05 +01:00
parent 5953781c13
commit 373d189edb
29 changed files with 1231 additions and 479 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/System.cpp
View file

@ -355,6 +355,7 @@ void Emulator::Load()
GetGSManager().Init();
GetCallbackManager().Init();
GetAudioManager().Init();
GetEventManager().Init();
thread.Run();
@ -448,6 +449,7 @@ void Emulator::Stop()
GetGSManager().Close();
GetAudioManager().Close();
GetEventManager().Clear();
GetCPU().Close();
//SysCallsManager.Close();
GetIdManager().Clear();