From 12ae7a9eeb23b586800d8ff77f2f1dfebb8b596b Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:00:31 -0800 Subject: [PATCH] Ignore unknown shortcut names in settings (#5565) --- cockatrice/src/settings/shortcuts_settings.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cockatrice/src/settings/shortcuts_settings.cpp b/cockatrice/src/settings/shortcuts_settings.cpp index 9618df378..c65cef644 100644 --- a/cockatrice/src/settings/shortcuts_settings.cpp +++ b/cockatrice/src/settings/shortcuts_settings.cpp @@ -28,6 +28,13 @@ ShortcutsSettings::ShortcutsSettings(const QString &settingsPath, QObject *paren QMap invalidItems; for (QStringList::const_iterator it = customKeys.constBegin(); it != customKeys.constEnd(); ++it) { QString stringSequence = shortCutsFile.value(*it).toString(); + + // check whether shortcut name exists + if (!shortCuts.contains(*it)) { + qCWarning(ShortcutsSettingsLog) << "Unknown shortcut name:" << *it; + continue; + } + // check whether shortcut is forbidden if (isKeyAllowed(*it, stringSequence)) { auto shortcut = getShortcut(*it);