From df1b413587f23b0adce6ecb7f71fc455be0d029f Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Mon, 29 Mar 2010 09:13:00 +0000 Subject: [PATCH] No need to issue an error if the shortcut binding did not change. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33905 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiPrefs.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index f599c9fc49..5e3d9ff8be 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -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; -- 2.39.5