franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1652 from FreddyFunk/static-cast 

configure_system: Fix compiler warning
This commit is contained in:
bunnei 2018-11-11 12:19:03 -08:00 committed by GitHub
parent a264fac943 d34d0bfc87
commit 7474382266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/settings.h
View File

@ -114,8 +114,8 @@ struct Values {
// System // System
bool use_docked_mode; bool use_docked_mode;
bool enable_nfc; bool enable_nfc;
int current_user; s32 current_user;
int language_index; s32 language_index;
// Controls // Controls
std::array<std::string, NativeButton::NumButtons> buttons; std::array<std::string, NativeButton::NumButtons> buttons;

2
src/yuzu/configuration/configure_system.cpp
View File

@ -240,7 +240,7 @@ void ConfigureSystem::RefreshConsoleID() {
void ConfigureSystem::SelectUser(const QModelIndex& index) { void ConfigureSystem::SelectUser(const QModelIndex& index) {
Settings::values.current_user = 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(); UpdateCurrentUser();