BufferView.cpp: typo

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index c24d87c92c4af7873b33911b3d6543382e6d5aed..7fa09164178b205b80a37e7bd34a0f82d614cf9d 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -502,16 +502,16 @@ void LyX::execCommands()
        // aknowledged.
 
        // if reconfiguration is needed.
-       while (LayoutFileList::get().empty()) {
+       if (LayoutFileList::get().empty()) {
                switch (Alert::prompt(
                        _("No textclass is found"),
-                       _("LyX cannot continue because no textclass is found. "
-                               "You can either reconfigure normally, or reconfigure using "
-                               "default textclasses, or quit LyX."),
+                       _("LyX will have minimal functionality because no textclasses "
+                               "have been found. You can either try to reconfigure LyX normally, "
+                               "try to reconfigure using only the defaults, or continue."),
                        0, 2,
                        _("&Reconfigure"),
-                       _("&Use Default"),
-                       _("&Exit LyX")))
+                       _("&Use Defaults"),
+                       _("&Continue")))
                {
                case 0:
                        // regular reconfigure
@@ -523,8 +523,7 @@ void LyX::execCommands()
                                " --without-latex-config"));
                        break;
                default:
-                       lyx::dispatch(FuncRequest(LFUN_LYX_QUIT));
-                       return;
+                       break;
                }
        }
        
@@ -652,9 +651,9 @@ static void error_handler(int err_sig)
 
 #ifdef SIGHUP
        if (err_sig == SIGSEGV ||
-    (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {
+               (err_sig != SIGHUP && !getEnv("LYXDEBUG").empty())) {
 #else
-  if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {
+       if (err_sig == SIGSEGV || !getEnv("LYXDEBUG").empty()) {
 #endif 
 #ifdef _MSC_VER
                // with abort() it crashes again.
@@ -762,10 +761,9 @@ bool LyX::init()
        // Set the language defined by the user.
        setRcGuiLanguage();
 
-       // Load the layouts
        LYXERR(Debug::INIT, "Reading layouts...");
-       if (!LyXSetStyle())
-               return false;
+       // Load the layouts
+       LayoutFileList::get().read();
        //...and the modules
        theModuleList.read();