Просмотр исходного кода

Merge pull request #403 from yuriks/shutdown-system

Frontends: Shutdown core when emulation is stopped
bunnei 11 лет назад
Родитель
Сommit
b058ce6feb
2 измененных файлов с 5 добавлено и 0 удалено
  1. 2 0
      src/citra/citra.cpp
  2. 3 0
      src/citra_qt/bootmanager.cpp

+ 2 - 0
src/citra/citra.cpp

@@ -51,6 +51,8 @@ int __cdecl main(int argc, char **argv) {
         Core::RunLoop();
         Core::RunLoop();
     }
     }
 
 
+    System::Shutdown();
+
     delete emu_window;
     delete emu_window;
 
 
     return 0;
     return 0;

+ 3 - 0
src/citra_qt/bootmanager.cpp

@@ -13,6 +13,7 @@
 
 
 #include "core/core.h"
 #include "core/core.h"
 #include "core/settings.h"
 #include "core/settings.h"
+#include "core/system.h"
 
 
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/debug_utils/debug_utils.h"
 
 
@@ -89,6 +90,8 @@ void EmuThread::Stop()
         }
         }
     }
     }
     LOG_INFO(Frontend, "EmuThread stopped");
     LOG_INFO(Frontend, "EmuThread stopped");
+
+    System::Shutdown();
 }
 }