diff options
author | bunnei <bunneidev@gmail.com> | 2018-11-11 12:19:03 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-11 12:19:03 -0800 |
commit | 7474382266ef62324dfccc3bb35d866073f90240 (patch) | |
tree | 13934f0da0804d27405947c23e10bd72cc8837c9 | |
parent | a264fac943db808eef534c5aed5aa9d93be291b9 (diff) | |
parent | d34d0bfc8702ec8d4ef9a3cd745c318e9a3562b3 (diff) |
Merge pull request #1652 from FreddyFunk/static-cast
configure_system: Fix compiler warning
-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(); |