]> git.lyx.org Git - features.git/commitdiff
No need to issue an error if the shortcut binding did not change.
authorVincent van Ravesteijn <vfr@lyx.org>
Mon, 29 Mar 2010 09:13:00 +0000 (09:13 +0000)
committerVincent van Ravesteijn <vfr@lyx.org>
Mon, 29 Mar 2010 09:13:00 +0000 (09:13 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33905 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiPrefs.cpp

index f599c9fc494839589157e868737b0cf4dc4d1645..5e3d9ff8beb6b80680a082043bb237dd774f9d84 100644 (file)
@@ -2803,13 +2803,9 @@ void PrefShortcuts::shortcutOkPressed()
        FuncRequest oldBinding = system_bind_.getBinding(k);
        if (oldBinding.action == LFUN_UNKNOWN_ACTION)
                oldBinding = user_bind_.getBinding(k);
-       if (oldBinding == func) {
-               docstring const actionStr = makeCmdString(func);
-               Alert::error(_("Failed to create shortcut"),
-                       bformat(_("Shortcut `%1$s' is already bound to:\n%2$s"), 
-                       k.print(KeySequence::ForGui), actionStr));
+       if (oldBinding == func)
+               // nothing has changed
                return;
-       }
        
        // make sure this key isn't already bound---and, if so, not unbound
        FuncCode const unbind = user_unbind_.getBinding(k).action;