* src/intl.C (InitKeyMapper): reset kbmap file names if the files

	could not be read (bug 2604).

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

diff --git a/src/intl.C b/src/intl.C
index 1efd0d60e7b34541b05fa48594fe1e9d34341fdf..69166a42b62f8e9f4c986904f650e4a00c1cd10a 100644 (file)
--- a/src/intl.C
+++ b/src/intl.C
@@ -77,6 +77,12 @@ void Intl::initKeyMapper(bool on)
 {
        lyxerr[Debug::INIT] << "Initializing key mappings..." << endl;
 
+       if (trans.setPrimary(prim_lang) == -1)
+               prim_lang.erase();
+       if (trans.setSecondary(sec_lang) == -1)
+               sec_lang.erase();
+       trans.setCharset(lyxrc.font_norm);
+
        if (prim_lang.empty() && sec_lang.empty())
                keymapon = false;
        else
@@ -86,8 +92,4 @@ void Intl::initKeyMapper(bool on)
 
        if (keymapon)
                keyMapPrim();
-
-       trans.setPrimary(prim_lang);
-       trans.setSecondary(sec_lang);
-       trans.setCharset(lyxrc.font_norm);
 }