Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 83ecf8f3cf39318860f0dc9917c84068 > files > 22

kdebase4-workspace-4.6.5-1.4.mga1.src.rpm

commit a03cf68d803cdad5a8b663e3c1b27265cf879e8f
Author: Simon Persson <simonpersson1@gmail.com>
Date:   Thu Apr 14 00:50:36 2011 +0200

    Only show one action for each shortcut, fixes cases where there are
    two standard actions using the same shortcut and changes to the first
    would be overwritten by the second.
    
    BUG: 228588
    CCMAIL: kde@michael-jansen.biz

diff --git a/kcontrol/standard_actions/standard_actions_module.cpp b/kcontrol/standard_actions/standard_actions_module.cpp
index f7d39c1..f1bd45d 100644
--- a/kcontrol/standard_actions/standard_actions_module.cpp
+++ b/kcontrol/standard_actions/standard_actions_module.cpp
@@ -109,7 +109,7 @@ void StandardActionsModule::load()
         KStandardShortcut::StandardShortcut shortcutId = KStandardAction::shortcutForActionId(id);
         // If the StandardShortcutId is AccelNone skip configuration for this
         // action.
-        if (shortcutId == KStandardShortcut::AccelNone)
+        if (shortcutId == KStandardShortcut::AccelNone || shortcutIdsAdded.contains(shortcutId))
             {
             continue;
             }