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
This commit is contained in:
Vincent van Ravesteijn 2009-08-03 19:54:32 +00:00
parent 898c621b84
commit 997d8ba557

View File

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