diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-07 14:45:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 14:45:45 -0400 |
| commit | 3242e7c16402b39ac0e4b7f044600f60a900bbbf (patch) | |
| tree | 59fe3c49811b91299e3be12b3e27d1faa970cea4 /src/yuzu/configuration/configure_general.cpp | |
| parent | c7072406855441284827e936eac4b871cb35544d (diff) | |
| parent | c8f6754417628d696f81513e34951193f8e5d023 (diff) | |
Merge pull request #950 from lioncash/hotkey
qt/hotkey: Get rid of global hotkey map instance
Diffstat (limited to 'src/yuzu/configuration/configure_general.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_general.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 04afc8724..d8caee1e8 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -35,6 +35,10 @@ void ConfigureGeneral::setConfiguration() { ui->use_docked_mode->setChecked(Settings::values.use_docked_mode); } +void ConfigureGeneral::PopulateHotkeyList(const HotkeyRegistry& registry) { + ui->widget->Populate(registry); +} + void ConfigureGeneral::applyConfiguration() { UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked(); UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); |