diff --git a/src/core/system.cpp b/src/core/system.cpp index 2ca1e7a54..21b0d31c9 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -560,7 +560,7 @@ bool Boot(const SystemBootParameters& params) return false; } - if (params.start_paused) + if (g_settings.start_paused || params.override_start_paused.value_or(false)) { DebugAssert(s_state == State::Running); s_state = State::Paused; @@ -705,7 +705,7 @@ bool Boot(const SystemBootParameters& params) } // Good to go. - s_state = params.start_paused ? State::Paused : State::Running; + s_state = (g_settings.start_paused || params.override_start_paused.value_or(false)) ? State::Paused : State::Running; return true; } diff --git a/src/core/system.h b/src/core/system.h index 7209b3f51..cc5ad41ae 100644 --- a/src/core/system.h +++ b/src/core/system.h @@ -27,11 +27,11 @@ struct SystemBootParameters std::string filename; std::optional override_fast_boot; std::optional override_fullscreen; + std::optional override_start_paused; std::unique_ptr state_stream; u32 media_playlist_index = 0; bool load_image_to_ram = false; bool force_software_renderer = false; - bool start_paused = false; }; namespace System {