citra-qt: Use structured bindings where applicable in ConfigureHotkeys::applyConfiguration. Fix a few minor issues.

* Address https://github.com/citra-emu/citra/pull/4437#discussion_r241380912
2019-01-20 16:14:07 +05:30
parent dccd1664ad
commit 71f36efd27
3 changed files with 11 additions and 11 deletions
@@ -32,8 +32,10 @@ void HotkeyRegistry::LoadHotkeys() {
            hk.keyseq = QKeySequence::fromString(shortcut.shortcut.first, QKeySequence::NativeText);
            hk.context = (Qt::ShortcutContext)shortcut.shortcut.second;
        }
-        if (hk.shortcut)
+        if (hk.shortcut) {
+            hk.shortcut->disconnect();
            hk.shortcut->setKey(hk.keyseq);
+        }
    }
 }