If a master is being created at loading the child, un-hide it.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 26bff558f6402ea4aeae81e78f3c99b03d6516af..9e1b048cc01785799fe1b7fe0b7867abcd0110bd 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -47,6 +47,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/mutex.h"
 #include "support/textutils.h"
 
 using namespace std;
@@ -94,12 +95,18 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
        bool const exists = filename.exists();
        bool const tryVC = exists ? false : LyXVC::fileInVC(filename);
        if (exists || tryVC) {
-               if (exists && !filename.isReadableFile()) {
-                       docstring text = bformat(_("The file %1$s exists but is not "
-                               "readable by the current user."),
-                               from_utf8(filename.absFileName()));
-                       Alert::error(_("File not readable!"), text);
-                       return 0;
+               if (exists) {
+                       if (!filename.isReadableFile()) {
+                               docstring text = bformat(_("The file %1$s exists but is not "
+                                       "readable by the current user."),
+                                       from_utf8(filename.absFileName()));
+                               Alert::error(_("File not readable!"), text);
+                               return 0;
+                       }
+                       if (filename.extension() == "lyx" && filename.isFileEmpty()) {
+                               // Makes it possible to open an empty (0 bytes) .lyx file
+                               return newFile(filename.absFileName(), "", true);
+                       }
                }
                Buffer * b = theBufferList().newBuffer(filename.absFileName());
                if (!b) {
@@ -119,7 +126,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                "exist.\n\nDo you want to create a new document?"),
                from_utf8(filename.absFileName()));
        if (!Alert::prompt(_("Create new document?"),
-                       text, 0, 1, _("&Create"), _("Cancel")))
+                       text, 0, 1, _("&Yes, Create New Document"), _("&No, Do Not Create")))
                return newFile(filename.absFileName(), string(), true);
 
        return 0;
@@ -173,15 +180,17 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix,
                                                string const & templatename)
 {
        static map<string, int> file_number;
+       static Mutex mutex;
 
+       Mutex::Locker locker(&mutex);
        FileName filename;
 
        do {
-               filename.set(path, 
+               filename.set(path,
                        prefix + convert<string>(++file_number[prefix]) + ".lyx");
        }
        while (theBufferList().exists(filename) || filename.isReadableFile());
-               
+
        return newFile(filename.absFileName(), templatename, false);
 }