Browse Source
Merge pull request #1652 from FreddyFunk/static-cast
configure_system: Fix compiler warning
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/core/settings.h
-
src/yuzu/configuration/configure_system.cpp
|
|
|
@ -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; |
|
|
|
|
|
|
|
@ -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(); |
|
|
|
|
|
|
|
|