summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration/configure_dialog.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-28 09:57:50 -0400
committerGitHub <noreply@github.com>2020-08-28 09:57:50 -0400
commit45b73ba840411fa61c75e6fe954b9a46ca5d59b6 (patch)
treec99333f0b6b386bfb80712d8e6ffa94bef04a9ff /src/yuzu/configuration/configure_dialog.cpp
parent40320a1d8428f9079d43a363421083678c4a9042 (diff)
parent9e1b0af25907f7a8b960aa5c1e7d931691f40196 (diff)
Merge pull request #4544 from lioncash/input-sub
input_common: Eliminate most global state
Diffstat (limited to 'src/yuzu/configuration/configure_dialog.cpp')
-rw-r--r--src/yuzu/configuration/configure_dialog.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_dialog.cpp b/src/yuzu/configuration/configure_dialog.cpp
index 857577591..8186929a6 100644
--- a/src/yuzu/configuration/configure_dialog.cpp
+++ b/src/yuzu/configuration/configure_dialog.cpp
@@ -12,7 +12,8 @@
#include "yuzu/configuration/configure_input_player.h"
#include "yuzu/hotkeys.h"
-ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
+ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry,
+ InputCommon::InputSubsystem* input_subsystem)
: QDialog(parent), ui(new Ui::ConfigureDialog), registry(registry) {
Settings::configuring_global = true;
@@ -20,6 +21,8 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
ui->hotkeysTab->Populate(registry);
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+ ui->inputTab->Initialize(input_subsystem);
+
SetConfiguration();
PopulateSelectionList();