settings,core,config_sys: Remove optional type from custom_rtc, rng_seed

core: Fix MSVC errors

2 files changed, 6 insertions, 3 deletions

diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e3f30f7e3..696929479 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -62,7 +62,8 @@ void LogSettings() {
 
     LOG_INFO(Config, "yuzu Configuration:");
     log_setting("Controls_UseDockedMode", values.use_docked_mode.GetValue());
-    log_setting("System_RngSeed", values.rng_seed.GetValue().value_or(0));
+    log_setting("System_RngSeedEnabled", values.rng_seed_enabled.GetValue());
+    log_setting("System_RngSeed", values.rng_seed.GetValue());
     log_setting("System_DeviceName", values.device_name.GetValue());
     log_setting("System_CurrentUser", values.current_user.GetValue());
     log_setting("System_LanguageIndex", values.language_index.GetValue());
diff --git a/src/common/settings.h b/src/common/settings.h
index 61d15467d..999f8b5be 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -505,10 +505,12 @@ struct Values {
     SwitchableSetting<u8> bg_blue{0, "bg_blue"};
 
     // System
-    SwitchableSetting<std::optional<u32>> rng_seed{std::optional<u32>(), "rng_seed"};
+    SwitchableSetting<bool> rng_seed_enabled{false, "rng_seed_enabled"};
+    SwitchableSetting<u32> rng_seed{0, "rng_seed"};
     Setting<std::string> device_name{"Yuzu", "device_name"};
     // Measured in seconds since epoch
-    std::optional<s64> custom_rtc;
+    SwitchableSetting<bool> custom_rtc_enabled{false, "custom_rtc_enabled"};
+    SwitchableSetting<s64> custom_rtc{0, "custom_rtc"};
     // Set on game boot, reset on stop. Seconds difference between current time and `custom_rtc`
     s64 custom_rtc_differential;