summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2022-12-20 15:10:41 +0100
committerGitHub <noreply@github.com>2022-12-20 15:10:41 +0100
commit1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc (patch)
treee5e99d292065c14dc92605070ee1086675c046a0 /src/core
parentMerge pull request #9482 from liamwhite/vkbump (diff)
parentqt: use _exit instead of exit on SIGINT (diff)
downloadyuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.tar
yuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.tar.gz
yuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.tar.bz2
yuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.tar.lz
yuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.tar.xz
yuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.tar.zst
yuzu-1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc.zip
Diffstat (limited to '')
-rw-r--r--src/core/core.cpp18
-rw-r--r--src/core/core.h4
2 files changed, 8 insertions, 14 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index a738f221f..47292cd78 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -183,26 +183,20 @@ struct System::Impl {
Initialize(system);
}
- SystemResultStatus Run() {
+ void Run() {
std::unique_lock<std::mutex> lk(suspend_guard);
- status = SystemResultStatus::Success;
kernel.Suspend(false);
core_timing.SyncPause(false);
is_paused.store(false, std::memory_order_relaxed);
-
- return status;
}
- SystemResultStatus Pause() {
+ void Pause() {
std::unique_lock<std::mutex> lk(suspend_guard);
- status = SystemResultStatus::Success;
core_timing.SyncPause(true);
kernel.Suspend(true);
is_paused.store(true, std::memory_order_relaxed);
-
- return status;
}
bool IsPaused() const {
@@ -553,12 +547,12 @@ void System::Initialize() {
impl->Initialize(*this);
}
-SystemResultStatus System::Run() {
- return impl->Run();
+void System::Run() {
+ impl->Run();
}
-SystemResultStatus System::Pause() {
- return impl->Pause();
+void System::Pause() {
+ impl->Pause();
}
bool System::IsPaused() const {
diff --git a/src/core/core.h b/src/core/core.h
index 4ebedffd9..fb5cda2f5 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -152,13 +152,13 @@ public:
* Run the OS and Application
* This function will start emulation and run the relevant devices
*/
- [[nodiscard]] SystemResultStatus Run();
+ void Run();
/**
* Pause the OS and Application
* This function will pause emulation and stop the relevant devices
*/
- [[nodiscard]] SystemResultStatus Pause();
+ void Pause();
/// Check if the core is currently paused.
[[nodiscard]] bool IsPaused() const;