adjust

[lyx.git] / src / TextClassList.cpp

diff --git a/src/TextClassList.cpp b/src/TextClassList.cpp
index bfda9d35d59f8c3e1533677052b5f19f86098a4d..708b1ac534dcf0ecb3b16ccaeea5b6b15e58213c 100644 (file)
--- a/src/TextClassList.cpp
+++ b/src/TextClassList.cpp
@@ -165,13 +165,15 @@ bool TextClassList::read()
        }
        LYXERR(Debug::TCLASS) << "End of parsing of textclass.lst" << endl;
 
-       if (classlist_.empty()) {
+       // lyx will start with an empty classlist_, but only reconfigure is allowed
+       // in this case. This gives users a second chance to configure lyx if
+       // initial configuration fails. (c.f. bug 2829)
+       if (classlist_.empty())
                lyxerr << "TextClassList::Read: no textclasses found!"
                       << endl;
-               return false;
-       }
-       // Ok everything loaded ok, now sort the list.
-       sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
+       else 
+               // Ok everything loaded ok, now sort the list.
+               sort(classlist_.begin(), classlist_.end(), less_textclass_avail_desc());
        return true;
 }