]> git.lyx.org Git - features.git/commitdiff
Make sure these are the same....
authorRichard Heck <rgheck@comcast.net>
Fri, 17 Jul 2009 21:41:04 +0000 (21:41 +0000)
committerRichard Heck <rgheck@comcast.net>
Fri, 17 Jul 2009 21:41:04 +0000 (21:41 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30653 a592a061-630c-0410-9148-cb99ea01b6c8

src/frontends/qt4/GuiApplication.cpp

index 35b71bef7eb28d76cb9760aa1e4521967c65695b..d236269ae2bb029d1169affe764142954fae8d0a 100644 (file)
@@ -1490,6 +1490,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
        }
 
        if (ui_path.empty()) {
+               static const QString defaultUIFile = "default";
                LYXERR(Debug::INIT, "Could not find " << name);
                if (include) {
                        Alert::warning(_("Could not find UI definition file"),
@@ -1497,7 +1498,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
                                        "Please check your installation."), qstring_to_ucs4(name)));
                        return false;
                }
-               if (name == "default") {
+               if (name == defaultUIFile) {
                        LYXERR(Debug::INIT, "Could not find default UI file!!");
                        Alert::warning(_("Could not find default UI file"),
                                _("LyX could not find the default UI file!\n"
@@ -1509,7 +1510,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
                        "Falling back to default.\n"
                        "Please look under Tools>Preferences>User Interface and\n"
                        "check which User Interface file you are using."), qstring_to_ucs4(name)));
-               return readUIFile("default", false);
+               return readUIFile(defaultUIFile, false);
        }
 
        // Ensure that a file is read only once (prevents include loops)