Remove unused font variable which caused a warning.

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 859d1fe672aa693e28aad8a9a9a15513d7ce084c..8b2b75bf7d747f8eb7f63d9b389cfd25d14a622b 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -42,6 +42,10 @@
 #include "converter.h"
 #include "language.h"
 #include "support/os.h"
+// for NO_LATEX
+#if 1
+#include "lyxfont.h"
+#endif
 
 using std::endl;
 
@@ -165,7 +169,7 @@ LyX::LyX(int * argc, char * argv[])
 
                // otherwise, let the GUI handle the batch command
                lyxGUI->regBuf(last_loaded);
-               lyxGUI->getLyXView()->getLyXFunc()->Dispatch(batch_command);
+               lyxGUI->getLyXView()->getLyXFunc()->dispatch(batch_command);
 
                // fall through...
        }
@@ -311,12 +315,19 @@ void LyX::init(bool gui)
                       <<_("set the environment variable LYX_DIR_11x to the "
                           "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
-               if (!path_shown)
+               if (!path_shown) {
+                       FileInfo fi(LYX_DIR);
+                       if (!fi.exist()) {
+                               lyxerr << "Couldn't even find the default LYX_DIR." << endl
+                                       << "Giving up." << endl;
+                               exit(1);
+                       }
                        lyxerr << _("Using built-in default ") 
                               << LYX_DIR << _(" but expect problems.")
                               << endl;
-               else
+               } else {
                        lyxerr << _("Expect problems.") << endl;
+               }
                system_lyxdir = LYX_DIR;
                path_shown = true;
        }
@@ -539,15 +550,13 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
                first_start = false;
                return;
        } else {
-               first_start = true;
+               first_start = !explicit_userdir;
        }
        
-       // Nope
-       // Different wording if the user specifically requested a directory
-       if (!AskQuestion( explicit_userdir
-                        ? _("You have specified an invalid LyX directory.")
-                        : _("You don't have a personal LyX directory.") ,
-
+       // If the user specified explicitely a directory, ask whether
+       // to create it (otherwise, always create it)
+       if (explicit_userdir &&
+           !AskQuestion(_("You have specified an invalid LyX directory."),
                         _("It is needed to keep your own configuration."),
                         _("Should I try to set it up for you (recommended)?"))) {
                lyxerr << _("Running without personal LyX directory.") << endl;