Changed tabular-file-format + fixes in tabular.

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 60f322ea01d5474294b104edc4076f18a06be1e9..94c84c60de004e79459f0c86e11e938934f03f25 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -351,10 +351,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 
-       // LYX_USERDIR_11x environment variable
+               // LYX_USERDIR_11x environment variable
                user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
 
-       // default behaviour
+               // default behaviour
                if (user_lyxdir.empty())
                        user_lyxdir = AddPath(GetEnvPath("HOME"),
                                                        string(".") + PACKAGE);
@@ -364,8 +364,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        lyxerr[Debug::INIT] << "User LyX directory: '" 
                            <<  user_lyxdir << '\'' << endl;
 
-       // Check that user LyX directory is ok.
-       queryUserLyXDir(explicit_userdir);
+       // Check that user LyX directory is ok. We don't do that if
+       // running in batch mode.
+       if (gui)
+               queryUserLyXDir(explicit_userdir);
 
        //
        // Shine up lyxrc defaults
@@ -424,8 +426,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
        // Ensure that we have really read a bind file, so that LyX is
        // usable.
-       if (!lyxrc.hasBindFile)
-               lyxrc.ReadBindFile();
+       lyxrc.readBindFileIfNeeded();
 
        // Read menus
        ReadUIFile(lyxrc.ui_file);