diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-29 22:09:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-29 22:09:01 -0500 |
| commit | f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4 (patch) | |
| tree | 63472a7c6dbd7bc9f77ba503800afdaf36982da5 /src/citra | |
| parent | 2f746e9946f78a2e283dfdcbeda9cf332e44d099 (diff) | |
| parent | 84e78790ab3f3e8883493b18946e97328d921774 (diff) | |
Merge pull request #2240 from wwylele/auto-region
Config: auto-select region and language
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/config.cpp | 3 | ||||
| -rw-r--r-- | src/citra/default_ini.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 29462c982..98f093258 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -89,7 +89,8 @@ void Config::ReadValues() { // System Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", false); - Settings::values.region_value = sdl2_config->GetInteger("System", "region_value", 1); + Settings::values.region_value = + sdl2_config->GetInteger("System", "region_value", Settings::REGION_VALUE_AUTO_SELECT); // Miscellaneous Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Info"); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 001b18ac2..50c4a2812 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -101,7 +101,7 @@ use_virtual_sd = is_new_3ds = # The system region that Citra will use during emulation -# 0: Japan, 1: USA (default), 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan +# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan region_value = [Miscellaneous] |