Improve error message

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 0a0a31959b9c8de262b8f71a0e479019edb9f7e1..20c5e83b01de8af67b0296a4ef802dae1d8f0e0a 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -150,7 +150,7 @@ void showFileError(string const & error)
                           "Please check your installation."), from_utf8(error)));
 }
 
-} // namespace anon
+} // namespace
 
 /// The main application class private implementation.
 struct LyX::Impl {
@@ -438,17 +438,16 @@ void LyX::prepareExit()
        // do any other cleanup procedures now
        if (package().temp_dir() != package().system_temp_dir()) {
                string const abs_tmpdir = package().temp_dir().absFileName();
-               if (!contains(package().temp_dir().absFileName(), "lyx_tmpdir")) {
+               if (!contains(abs_tmpdir, "lyx_tmpdir")) {
                        docstring const msg =
                                bformat(_("%1$s does not appear like a LyX created temporary directory."),
                                from_utf8(abs_tmpdir));
                        Alert::warning(_("Cannot remove temporary directory"), msg);
                } else {
-                       LYXERR(Debug::INFO, "Deleting tmp dir "
-                               << package().temp_dir().absFileName());
+                       LYXERR(Debug::INFO, "Deleting tmp dir " << abs_tmpdir);
                        if (!package().temp_dir().destroyDirectory()) {
                                LYXERR0(bformat(_("Unable to remove the temporary directory %1$s"),
-                                       from_utf8(package().temp_dir().absFileName())));
+                                       from_utf8(abs_tmpdir)));
                        }
                }
        }
@@ -500,7 +499,7 @@ int LyX::init(int & argc, char * argv[])
 
        if (first_start) {
                pimpl_->files_to_load_.push_back(
-                       i18nLibFileSearch("examples", "splash.lyx").absFileName());
+                       i18nLibFileSearch("examples", "Welcome.lyx").absFileName());
        }
 
        return EXIT_SUCCESS;
@@ -775,7 +774,7 @@ namespace {
                        return std::string(line, nameLen);
                }
        }
-}
+} // namespace
 
 void cleanDuplicateEnvVars()
 {
@@ -1384,7 +1383,7 @@ int parse_force(string const & arg, string const &, string &)
 }
 
 
-} // namespace anon
+} // namespace
 
 
 void LyX::easyParse(int & argc, char * argv[])