diff options
author | Frederic Laing <27208977+FreddyFunk@users.noreply.github.com> | 2018-11-06 16:38:10 +0100 |
---|---|---|
committer | Frederic Laing <27208977+FreddyFunk@users.noreply.github.com> | 2018-11-06 16:38:10 +0100 |
commit | d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3 (patch) | |
tree | 5ea559644ff97482cd9bdc67c16083576f8480b3 | |
parent | Merge pull request #1616 from FernandoS27/cube-array (diff) | |
download | yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.tar yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.tar.gz yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.tar.bz2 yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.tar.lz yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.tar.xz yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.tar.zst yuzu-d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3.zip |
-rw-r--r-- | src/core/settings.h | 4 | ||||
-rw-r--r-- | src/yuzu/configuration/configure_system.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index b5aeff29b..a8954647f 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -114,8 +114,8 @@ struct Values { // System bool use_docked_mode; bool enable_nfc; - int current_user; - int language_index; + s32 current_user; + s32 language_index; // Controls std::array<std::string, NativeButton::NumButtons> buttons; diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index b4b4a4a56..4803d43bb 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -240,7 +240,7 @@ void ConfigureSystem::RefreshConsoleID() { void ConfigureSystem::SelectUser(const QModelIndex& index) { Settings::values.current_user = - std::clamp<std::size_t>(index.row(), 0, profile_manager->GetUserCount() - 1); + std::clamp<s32>(index.row(), 0, static_cast<s32>(profile_manager->GetUserCount() - 1)); UpdateCurrentUser(); |