diff --git a/README.md b/README.md index eb342810e..6a0623868 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1693. +This is the source code for early-access 1694. ## Legal Notice diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 09b19f43d..99a5df241 100755 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -105,6 +105,22 @@ void ConfigureSystem::ReadSystemSettings() {} void ConfigureSystem::ApplyConfiguration() { auto& system = Core::System::GetInstance(); + // Allow setting custom RTC even if system is powered on, + // to allow in-game time to be fast forwarded + if (Settings::IsConfiguringGlobal()) { + if (ui->custom_rtc_checkbox->isChecked()) { + Settings::values.custom_rtc = + std::chrono::seconds(ui->custom_rtc_edit->dateTime().toSecsSinceEpoch()); + if (system.IsPoweredOn()) { + const s64 posix_time{Settings::values.custom_rtc->count() + + Service::Time::TimeManager::GetExternalTimeZoneOffset()}; + system.GetTimeManager().UpdateLocalSystemClockTime(posix_time); + } + } else { + Settings::values.custom_rtc = std::nullopt; + } + } + if (!enabled) { return; } @@ -125,20 +141,6 @@ void ConfigureSystem::ApplyConfiguration() { Settings::values.rng_seed.SetValue(std::nullopt); } } - - // Allow setting custom RTC even if system is powered on, - // to allow in-game time to be fast forwarded - if (ui->custom_rtc_checkbox->isChecked()) { - Settings::values.custom_rtc = - std::chrono::seconds(ui->custom_rtc_edit->dateTime().toSecsSinceEpoch()); - if (system.IsPoweredOn()) { - const s64 posix_time{Settings::values.custom_rtc->count() + - Service::Time::TimeManager::GetExternalTimeZoneOffset()}; - system.GetTimeManager().UpdateLocalSystemClockTime(posix_time); - } - } else { - Settings::values.custom_rtc = std::nullopt; - } } else { switch (use_rng_seed) { case ConfigurationShared::CheckState::On: