GuiPrefs.cpp: revert changes that accidentally slipped in in r33414

(That was Vincents patch for #5735)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33416 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 2b32d36922259e292d28aa0c1a5c720a62744dcb..4518838456d131f635df510acedb43869c3f44fb 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2805,8 +2805,7 @@ void PrefShortcuts::shortcutOkPressed()
        
        // make sure this key isn't already bound---and, if so, not unbound
        FuncCode const unbind = user_unbind_.getBinding(k).action;
-       if (oldBinding.action != LFUN_UNKNOWN_ACTION && unbind == LFUN_UNKNOWN_ACTION
-               && toqstr(makeCmdString(oldBinding)) != save_lfun_)
+       if (oldBinding.action != LFUN_UNKNOWN_ACTION && unbind == LFUN_UNKNOWN_ACTION)
        {
                // FIXME Perhaps we should offer to over-write the old shortcut?
                // If so, we'll need to remove it from our list, etc.
@@ -2818,7 +2817,7 @@ void PrefShortcuts::shortcutOkPressed()
                return;
        }
 
-       if (!save_lfun_.isEmpty())
+       if (!save_lfun_.isEmpty() && new_lfun == save_lfun_)
                // real modification of the lfun's shortcut,
                // so remove the previous one
                removeShortcut();