diff options
author | bunnei <bunneidev@gmail.com> | 2016-12-22 17:47:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-22 17:47:44 +0100 |
commit | aa47af7fb6efd0bda54cca2373ed978e538f6d61 (patch) | |
tree | 93d96872603f64925cd632f27bb5c7046cadeedf /src/citra_qt/bootmanager.cpp | |
parent | Merge pull request #2285 from mailwl/csnd-format (diff) | |
parent | ThreadContext: Move from "core" to "arm_interface". (diff) | |
download | yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.gz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.bz2 yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.lz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.xz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.zst yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.zip |
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index c7eb2aafc..bb75633b6 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -14,8 +14,6 @@ #include "common/scm_rev.h" #include "common/string_util.h" #include "core/core.h" -#include "core/settings.h" -#include "core/system.h" #include "video_core/debug_utils/debug_utils.h" #include "video_core/video_core.h" @@ -38,7 +36,7 @@ void EmuThread::run() { if (!was_active) emit DebugModeLeft(); - Core::RunLoop(); + Core::System::GetInstance().RunLoop(); was_active = running || exec_step; if (!was_active && !stop_run) @@ -48,7 +46,7 @@ void EmuThread::run() { emit DebugModeLeft(); exec_step = false; - Core::SingleStep(); + Core::System::GetInstance().SingleStep(); emit DebugModeEntered(); yieldCurrentThread(); @@ -60,7 +58,7 @@ void EmuThread::run() { } // Shutdown the core emulation - System::Shutdown(); + Core::System::GetInstance().Shutdown(); #if MICROPROFILE_ENABLED MicroProfileOnThreadExit(); |