From 093d932104cfdc8c9f752a64448b8fa5d7e29b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 2 Jan 2015 18:11:52 +0100 Subject: [PATCH] fixed deleting shortcut from action --- shortcuts_management/shortcuts_manager.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shortcuts_management/shortcuts_manager.cpp b/shortcuts_management/shortcuts_manager.cpp index 40e725de..bbde5df5 100644 --- a/shortcuts_management/shortcuts_manager.cpp +++ b/shortcuts_management/shortcuts_manager.cpp @@ -112,6 +112,9 @@ void ShortcutsManager::registerActions(const QList &a) bool ShortcutsManager::checkConflicts(const QKeySequence & shortcut, const QAction *dest) { + if(shortcut.isEmpty()) + return false; + foreach(QAction * action, actions) { if(action != dest) //if the same shortcut is setted there is no conflict