#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/mutex.h"
#include "support/textutils.h"
using namespace std;
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) {
Buffer * newUnnamedFile(FileName const & path, string const & prefix,
string const & templatename)
{
- // FIXME THREAD
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);
}