diff options
| author | 2018-09-18 19:58:28 -0400 | |
|---|---|---|
| committer | 2018-09-18 19:58:28 -0400 | |
| commit | 9155c8daeb2207dfa23ab4bf33a2ba244a325cf9 (patch) | |
| tree | e5ff7af81fc0075b357ed9d698d7db194004e96b /src/yuzu_cmd | |
| parent | Merge pull request #1343 from lioncash/mutex (diff) | |
| download | yuzu-9155c8daeb2207dfa23ab4bf33a2ba244a325cf9.tar.gz yuzu-9155c8daeb2207dfa23ab4bf33a2ba244a325cf9.tar.xz yuzu-9155c8daeb2207dfa23ab4bf33a2ba244a325cf9.zip | |
Invalid default value of username in yuzu_cmd (#1334)
* Fix bug where default username value for yuzu_cmd create an userprofile with uninitialize data as username
* Fix format
* Apply code review changes
* Remove nullptr check
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 991abda2e..7ec1f5110 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -125,6 +125,10 @@ void Config::ReadValues() { | |||
| 125 | 125 | ||
| 126 | // System | 126 | // System |
| 127 | Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false); | 127 | Settings::values.use_docked_mode = sdl2_config->GetBoolean("System", "use_docked_mode", false); |
| 128 | Settings::values.username = sdl2_config->Get("System", "username", "yuzu"); | ||
| 129 | if (Settings::values.username.empty()) { | ||
| 130 | Settings::values.username = "yuzu"; | ||
| 131 | } | ||
| 128 | 132 | ||
| 129 | // Miscellaneous | 133 | // Miscellaneous |
| 130 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); | 134 | Settings::values.log_filter = sdl2_config->Get("Miscellaneous", "log_filter", "*:Trace"); |
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 002a4ec15..d35c441e9 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -176,7 +176,7 @@ use_docked_mode = | |||
| 176 | 176 | ||
| 177 | # Sets the account username, max length is 32 characters | 177 | # Sets the account username, max length is 32 characters |
| 178 | # yuzu (default) | 178 | # yuzu (default) |
| 179 | username = | 179 | username = yuzu |
| 180 | 180 | ||
| 181 | # Sets the systems language index | 181 | # Sets the systems language index |
| 182 | # 0: Japanese, 1: English (default), 2: French, 3: German, 4: Italian, 5: Spanish, 6: Chinese, | 182 | # 0: Japanese, 1: English (default), 2: French, 3: German, 4: Italian, 5: Spanish, 6: Chinese, |