* GuiPrefs.cpp (apply):

	- unbind existing shortcuts before binding new ones (bug 5444).
	  Patch submitted and tested by Bennett.

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

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 406305df610b15d99413ccbae8315cc41d26e76e..a309380111b0e4cf34a99946107b1caa14f3a401 100644 (file)
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -2050,8 +2050,8 @@ void PrefShortcuts::apply(LyXRC & rc) const
                return;
        }
        FileName user_bind_file(bind_dir.absFilename() + "/user.bind");
-       user_bind_.write(user_bind_file.toFilesystemEncoding(), false, false);
-       user_unbind_.write(user_bind_file.toFilesystemEncoding(), true, true);
+       user_unbind_.write(user_bind_file.toFilesystemEncoding(), false, true);
+       user_bind_.write(user_bind_file.toFilesystemEncoding(), true, false);
        // immediately apply the keybindings. Why this is not done before?
        // The good thing is that the menus are updated automatically.
        theTopLevelKeymap().clear();