summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-08-07 21:33:07 +0200
committerbunnei <bunneidev@gmail.com>2021-12-07 01:39:17 +0100
commit08c63d5c75522ce6b484153302de4c6cfac674f2 (patch)
tree5aedfd853bafb5922c7e9313781bb45ca627cdad /src
parentcore: hle: kernel: k_auto_object: Add GetName method. (diff)
downloadyuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.tar
yuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.tar.gz
yuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.tar.bz2
yuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.tar.lz
yuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.tar.xz
yuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.tar.zst
yuzu-08c63d5c75522ce6b484153302de4c6cfac674f2.zip
Diffstat (limited to 'src')
-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 45cc176dc..d9bd5b665 100644
--- a/src/core/cpu_manager.cpp
+++ b/src/core/cpu_manager.cpp
@@ -32,7 +32,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);
}
}
@@ -347,13 +347,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();