From 997d8ba557df12a15b780a6ef773e69e02b7708b Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Mon, 3 Aug 2009 19:54:32 +0000 Subject: [PATCH] Fix bug #6119: Keyboard map still shows up after deleting. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30850 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/LyXRC.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 39c1172f92..00ac217963 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -450,10 +450,8 @@ int LyXRC::read(Lexer & lexrc) case RC_KBMAP_PRIMARY: if (lexrc.next()) { string const kmap(os::internal_path(lexrc.getString())); - if (kmap.empty()) { - // nothing - } else if (!libFileSearch("kbd", kmap, - "kmap").empty()) { + if (!libFileSearch("kbd", kmap, "kmap").empty() + || kmap.empty()) { primary_kbmap = kmap; } else { lexrc.printError("LyX: Keymap `$$Token' not found"); @@ -464,10 +462,8 @@ int LyXRC::read(Lexer & lexrc) case RC_KBMAP_SECONDARY: if (lexrc.next()) { string const kmap(os::internal_path(lexrc.getString())); - if (kmap.empty()) { - // nothing - } else if (!libFileSearch("kbd", kmap, - "kmap").empty()) { + if (!libFileSearch("kbd", kmap, "kmap").empty() + || kmap.empty()) { secondary_kbmap = kmap; } else { lexrc.printError("LyX: Keymap `$$Token' not found"); -- 2.39.5