summaryrefslogtreecommitdiff
path: root/src/yuzu/bootmanager.cpp
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-10-15 17:57:58 -0400
committerGitHub <noreply@github.com>2021-10-15 17:57:58 -0400
commitdc385b7392df2b2c301b6df908483beadbb5eb3b (patch)
treef03cf5293b06159cfc9325ee4527a4ea15685c25 /src/yuzu/bootmanager.cpp
parent2a5014b1936887ae1826a74efaefafca1bca0cae (diff)
parent5c6ca597c5d0828fc76da7bc800d0e76a16ea5e9 (diff)
Merge pull request #7182 from Morph1984/system
yuzu: Remove all remaining global system instances
Diffstat (limited to 'src/yuzu/bootmanager.cpp')
-rw-r--r--src/yuzu/bootmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index c75f5e1ee..40fd47406 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -86,15 +86,15 @@ void EmuThread::run() {
}
running_guard = true;
- Core::System::ResultStatus result = system.Run();
- if (result != Core::System::ResultStatus::Success) {
+ Core::SystemResultStatus result = system.Run();
+ if (result != Core::SystemResultStatus::Success) {
running_guard = false;
this->SetRunning(false);
emit ErrorThrown(result, system.GetStatusDetails());
}
running_wait.Wait();
result = system.Pause();
- if (result != Core::System::ResultStatus::Success) {
+ if (result != Core::SystemResultStatus::Success) {
running_guard = false;
this->SetRunning(false);
emit ErrorThrown(result, system.GetStatusDetails());