summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/frontend/applets/controller.cpp3
-rw-r--r--src/yuzu/applets/controller.cpp12
2 files changed, 8 insertions, 7 deletions
diff --git a/src/core/frontend/applets/controller.cpp b/src/core/frontend/applets/controller.cpp
index 31a5cb2cc..4505da758 100644
--- a/src/core/frontend/applets/controller.cpp
+++ b/src/core/frontend/applets/controller.cpp
@@ -29,7 +29,8 @@ void DefaultControllerApplet::ReconfigureControllers(std::function<void()> callb
29 29
30 auto& players = Settings::values.players; 30 auto& players = Settings::values.players;
31 31
32 const auto min_supported_players = parameters.enable_single_mode ? 1 : parameters.min_players; 32 const std::size_t min_supported_players =
33 parameters.enable_single_mode ? 1 : parameters.min_players;
33 34
34 // Disconnect Handheld first. 35 // Disconnect Handheld first.
35 npad.DisconnectNPadAtIndex(8); 36 npad.DisconnectNPadAtIndex(8);
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp
index c960eb3dd..9d45f2a01 100644
--- a/src/yuzu/applets/controller.cpp
+++ b/src/yuzu/applets/controller.cpp
@@ -289,11 +289,9 @@ void QtControllerSelectorDialog::CallConfigureInputDialog() {
289 289
290void QtControllerSelectorDialog::CheckIfParametersMet() { 290void QtControllerSelectorDialog::CheckIfParametersMet() {
291 // Here, we check and validate the current configuration against all applicable parameters. 291 // Here, we check and validate the current configuration against all applicable parameters.
292 const auto& players = Settings::values.players; 292 const auto num_connected_players = static_cast<int>(
293
294 const auto num_connected_players =
295 std::count_if(player_groupboxes.begin(), player_groupboxes.end(), 293 std::count_if(player_groupboxes.begin(), player_groupboxes.end(),
296 [this](const QGroupBox* player) { return player->isChecked(); }); 294 [this](const QGroupBox* player) { return player->isChecked(); }));
297 295
298 const auto min_supported_players = parameters.enable_single_mode ? 1 : parameters.min_players; 296 const auto min_supported_players = parameters.enable_single_mode ? 1 : parameters.min_players;
299 const auto max_supported_players = parameters.enable_single_mode ? 1 : parameters.max_players; 297 const auto max_supported_players = parameters.enable_single_mode ? 1 : parameters.max_players;
@@ -489,7 +487,8 @@ void QtControllerSelectorDialog::UpdateLEDPattern(std::size_t player_index) {
489} 487}
490 488
491void QtControllerSelectorDialog::UpdateBorderColor(std::size_t player_index) { 489void QtControllerSelectorDialog::UpdateBorderColor(std::size_t player_index) {
492 if (!parameters.enable_border_color || player_index >= parameters.max_players || 490 if (!parameters.enable_border_color ||
491 player_index >= static_cast<std::size_t>(parameters.max_players) ||
493 player_groupboxes[player_index]->styleSheet().contains(QStringLiteral("QGroupBox"))) { 492 player_groupboxes[player_index]->styleSheet().contains(QStringLiteral("QGroupBox"))) {
494 return; 493 return;
495 } 494 }
@@ -506,7 +505,8 @@ void QtControllerSelectorDialog::UpdateBorderColor(std::size_t player_index) {
506} 505}
507 506
508void QtControllerSelectorDialog::SetExplainText(std::size_t player_index) { 507void QtControllerSelectorDialog::SetExplainText(std::size_t player_index) {
509 if (!parameters.enable_explain_text || player_index >= parameters.max_players) { 508 if (!parameters.enable_explain_text ||
509 player_index >= static_cast<std::size_t>(parameters.max_players)) {
510 return; 510 return;
511 } 511 }
512 512