diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-08-28 17:44:36 +0200 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2020-09-04 18:23:25 +0200 |
| commit | 1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab (patch) | |
| tree | b48aa74103657a94882a658c750a6613f1e816da | |
| parent | applets/controller: Set min_players to have a minimum value of 1. (diff) | |
| download | yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.gz yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.bz2 yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.lz yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.xz yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.tar.zst yuzu-1ec71b6ea05b1a2ce5f1f6de4b4a979db7218aab.zip | |
| -rw-r--r-- | src/yuzu/applets/controller.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_input.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/yuzu/applets/controller.cpp b/src/yuzu/applets/controller.cpp index 4920d2df6..f2690b8dc 100644 --- a/src/yuzu/applets/controller.cpp +++ b/src/yuzu/applets/controller.cpp @@ -102,7 +102,8 @@ constexpr int GetIndexFromControllerType(Settings::ControllerType type) { } // namespace QtControllerSelectorDialog::QtControllerSelectorDialog( - QWidget* parent, Core::Frontend::ControllerParameters parameters_, InputCommon::InputSubsystem* input_subsystem_) + QWidget* parent, Core::Frontend::ControllerParameters parameters_, + InputCommon::InputSubsystem* input_subsystem_) : QDialog(parent), ui(std::make_unique<Ui::QtControllerSelectorDialog>()), parameters(std::move(parameters_)), input_subsystem(input_subsystem_) { ui->setupUi(this); diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp index 3befcc739..7ea17a4db 100644 --- a/src/yuzu/configuration/configure_input.cpp +++ b/src/yuzu/configuration/configure_input.cpp @@ -70,7 +70,8 @@ ConfigureInput::ConfigureInput(QWidget* parent) ConfigureInput::~ConfigureInput() = default; -void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, std::size_t max_players) { +void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem, + std::size_t max_players) { player_controllers = { new ConfigureInputPlayer(this, 0, ui->consoleInputSettings, input_subsystem), new ConfigureInputPlayer(this, 1, ui->consoleInputSettings, input_subsystem), |