From: Richard Heck <rgheck@comcast.net>
Date: Fri, 17 Jul 2009 21:41:04 +0000 (+0000)
Subject: Make sure these are the same....
X-Git-Tag: 2.0.0~5977
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=660b950aa739a6606ff03313d8984ab14f81b4b9;p=features.git

Make sure these are the same....


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

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 35b71bef7e..d236269ae2 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -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)