anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(That was Vincents patch for #5735)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33416 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-02-11 01:41:47 +00:00
parent a80c577f30
commit 3c2ede2dc6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt4/GuiPrefs.cpp
View File

@ -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();