summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-08-07 21:33:07 +0200
committerbunnei <bunneidev@gmail.com>2021-08-07 21:33:07 +0200
commit9e3d1d865c4baf2cfc3bf937136eb7625091603f (patch)
treefc0285bc44e76996e7a94cf2a76a782f87c27789
parentcore: hle: service: buffer_queue: Improve management of KEvent. (diff)
downloadyuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.tar
yuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.tar.gz
yuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.tar.bz2
yuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.tar.lz
yuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.tar.xz
yuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.tar.zst
yuzu-9e3d1d865c4baf2cfc3bf937136eb7625091603f.zip
-rw-r--r--src/core/cpu_manager.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/cpu_manager.cpp b/src/core/cpu_manager.cpp
index e2c4f0e07..35c1a6cbd 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -33,7 +33,7 @@ void CpuManager::Initialize() {
core_data[core].host_thread = std::jthread(ThreadStart, std::ref(*this), core);
}
} else {
- core_data[0].host_thread = std::jthread(ThreadStart, std::ref(*this), 0);
+ core_data[0].host_thread = std::jthread(ThreadStart, std::ref(*this), -1);
}
}
@@ -348,13 +348,9 @@ void CpuManager::RunThread(std::stop_token stop_token, std::size_t core) {
sc_sync_first_use = false;
}
- // Abort if emulation was killed before the session really starts
- if (!system.IsPoweredOn()) {
- return;
- }
-
+ // Emulation was stopped
if (stop_token.stop_requested()) {
- break;
+ return;
}
auto current_thread = system.Kernel().CurrentScheduler()->GetCurrentThread();