diff options
| author | 2016-12-15 19:01:48 -0500 | |
|---|---|---|
| committer | 2016-12-21 23:29:13 -0500 | |
| commit | 232ef55c1a13552e5ba8b72d61d1d072f5851598 (patch) | |
| tree | 729ee82ded58202888a2c27bdc3beec6ab926768 /src/citra_qt/bootmanager.cpp | |
| parent | file_util: Remove unused paths. (diff) | |
| download | yuzu-232ef55c1a13552e5ba8b72d61d1d072f5851598.tar.gz yuzu-232ef55c1a13552e5ba8b72d61d1d072f5851598.tar.xz yuzu-232ef55c1a13552e5ba8b72d61d1d072f5851598.zip | |
core: Consolidate core and system state, remove system module & cleanups.
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 5e8ae3066..bb75633b6 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | #include "common/scm_rev.h" | 14 | #include "common/scm_rev.h" |
| 15 | #include "common/string_util.h" | 15 | #include "common/string_util.h" |
| 16 | #include "core/core.h" | 16 | #include "core/core.h" |
| 17 | #include "core/settings.h" | ||
| 18 | #include "core/system.h" | ||
| 19 | #include "video_core/debug_utils/debug_utils.h" | 17 | #include "video_core/debug_utils/debug_utils.h" |
| 20 | #include "video_core/video_core.h" | 18 | #include "video_core/video_core.h" |
| 21 | 19 | ||
| @@ -38,7 +36,7 @@ void EmuThread::run() { | |||
| 38 | if (!was_active) | 36 | if (!was_active) |
| 39 | emit DebugModeLeft(); | 37 | emit DebugModeLeft(); |
| 40 | 38 | ||
| 41 | Core::RunLoop(); | 39 | Core::System::GetInstance().RunLoop(); |
| 42 | 40 | ||
| 43 | was_active = running || exec_step; | 41 | was_active = running || exec_step; |
| 44 | if (!was_active && !stop_run) | 42 | if (!was_active && !stop_run) |
| @@ -48,7 +46,7 @@ void EmuThread::run() { | |||
| 48 | emit DebugModeLeft(); | 46 | emit DebugModeLeft(); |
| 49 | 47 | ||
| 50 | exec_step = false; | 48 | exec_step = false; |
| 51 | Core::SingleStep(); | 49 | Core::System::GetInstance().SingleStep(); |
| 52 | emit DebugModeEntered(); | 50 | emit DebugModeEntered(); |
| 53 | yieldCurrentThread(); | 51 | yieldCurrentThread(); |
| 54 | 52 | ||