From 91f6855ca26d328f190180328edda3015c89d2f7 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Fri, 17 Jul 2009 21:51:53 +0000 Subject: [PATCH] Make sure we don't get into an infinite loop here. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30656 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/KeyMap.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp index c8f15d1cf9..bf63ffe0be 100644 --- a/src/KeyMap.cpp +++ b/src/KeyMap.cpp @@ -215,6 +215,7 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt if (bf.empty()) { if (rt == MissingOK) return true; + lyxerr << "Could not find bind file: " << bind_file; if (rt == Default) { frontend::Alert::warning(_("Could not find bind file"), @@ -222,17 +223,20 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map, BindReadType rt "Please check your installation."), from_utf8(bind_file))); return false; } + + static string const defaultBindfile = "cua"; + if (bind_file == defaultBindfile) { + frontend::Alert::warning(_("Could not find cua bind file"), + _("Unable to find the default bind file `cua'.\n" + "Please check your installation.")); + return false; + } + + // Try it with the default file. frontend::Alert::warning(_("Could not find bind file"), bformat(_("Unable to find the bind file\n%1$s.\n" "Falling back to default."), from_utf8(bind_file))); - // So try it with the default file. - if (read("cua", unbind_map)) - return true; - lyxerr << "Could not find cua bind file!"; - frontend::Alert::warning(_("Could not find cua bind file"), - _("Unable to find the default bind file `cua'.\n" - "Please check your installation.")); - return false; + return read(defaultBindfile, unbind_map); } return read(bf, unbind_map); } -- 2.39.2