Author: rgheck
Date: Mon Jan 17 16:07:54 2011
New Revision: 37242
URL: http://www.lyx.org/trac/changeset/37242
Log:
Previous two commits did the wrong thing. This is right.
Modified:
lyx-devel/trunk/src/LyX.cpp
lyx-devel/trunk/src/LyXRC.h
Modified: lyx-devel/trunk/src/LyX.cpp
==============================================================================
--- lyx-devel/trunk/src/LyX.cpp Mon Jan 17 16:02:54 2011 (r37241)
+++ lyx-devel/trunk/src/LyX.cpp Mon Jan 17 16:07:54 2011 (r37242)
@@ -967,7 +967,7 @@
FileName const lyxrc_path = libFileSearch(string(), name);
if (!lyxrc_path.empty()) {
LYXERR(Debug::INIT, "Found in " << lyxrc_path);
- if (lyxrc.read(lyxrc_path) != LyXRC::ReadOK) {
+ if (!lyxrc.read(lyxrc_path)) {
showFileError(name);
return false;
}
Modified: lyx-devel/trunk/src/LyXRC.h
==============================================================================
--- lyx-devel/trunk/src/LyXRC.h Mon Jan 17 16:02:54 2011 (r37241)
+++ lyx-devel/trunk/src/LyXRC.h Mon Jan 17 16:07:54 2011 (r37242)
@@ -195,14 +195,13 @@
bool read(support::FileName const & filename);
///
bool read(std::istream &);
- ///
+private:
enum ReturnValues {
ReadOK,
FileError,
ReadError,
FormatMismatch
};
-private:
///
ReturnValues readWithoutConv(support::FileName const &);
///
