summaryrefslogtreecommitdiff
path: root/src/yuzu_cmd/config.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2020-05-13 21:41:45 -0400
committerGravatar GitHub2020-05-13 21:41:45 -0400
commit670a7f51e8f3134fb246a471f0c9833904a6234e (patch)
treed20a6ccc6070f49aefd3069456545451a42e66cf /src/yuzu_cmd/config.cpp
parentMerge pull request #3899 from ReinUsesLisp/float-comparisons (diff)
parenttime_zone: Use std::chrono::seconds for strong typing. (diff)
downloadyuzu-670a7f51e8f3134fb246a471f0c9833904a6234e.tar.gz
yuzu-670a7f51e8f3134fb246a471f0c9833904a6234e.tar.xz
yuzu-670a7f51e8f3134fb246a471f0c9833904a6234e.zip
Merge pull request #3909 from bunnei/timezone
Improve time zone support
Diffstat (limited to 'src/yuzu_cmd/config.cpp')
-rw-r--r--src/yuzu_cmd/config.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp
index 8476a5a16..2348e6e0d 100644
--- a/src/yuzu_cmd/config.cpp
+++ b/src/yuzu_cmd/config.cpp
@@ -367,6 +367,9 @@ void Config::ReadValues() {
367 Settings::values.custom_rtc = std::nullopt; 367 Settings::values.custom_rtc = std::nullopt;
368 } 368 }
369 369
370 Settings::values.language_index = sdl2_config->GetInteger("System", "language_index", 1);
371 Settings::values.time_zone_index = sdl2_config->GetInteger("System", "time_zone_index", 0);
372
370 // Core 373 // Core
371 Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false); 374 Settings::values.use_multi_core = sdl2_config->GetBoolean("Core", "use_multi_core", false);
372 375
@@ -409,8 +412,6 @@ void Config::ReadValues() {
409 Settings::values.audio_device_id = sdl2_config->Get("Audio", "output_device", "auto"); 412 Settings::values.audio_device_id = sdl2_config->Get("Audio", "output_device", "auto");
410 Settings::values.volume = static_cast<float>(sdl2_config->GetReal("Audio", "volume", 1)); 413 Settings::values.volume = static_cast<float>(sdl2_config->GetReal("Audio", "volume", 1));
411 414
412 Settings::values.language_index = sdl2_config->GetInteger("System", "language_index", 1);
413
414 // Miscellaneous 415 // Miscellaneous
415 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); 416 Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace");
416 Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false); 417 Settings::values.use_dev_keys = sdl2_config->GetBoolean("Miscellaneous", "use_dev_keys", false);