X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=dc46dcdbc2c4eb6c85fd81481daaecb6446b03ef;hb=402d41b82d6e0bd1d8ff72a29fd9d27f94a3d616;hp=03ecc90abeb9d9a8bea5c4ec654ac38fde923016;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp index 03ecc90abe..dc46dcdbc2 100644 --- a/src/buffer_funcs.cpp +++ b/src/buffer_funcs.cpp @@ -95,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) { @@ -180,11 +186,11 @@ Buffer * newUnnamedFile(FileName const & path, string const & prefix, FileName filename; do { - filename.set(path, + filename.set(path, prefix + convert(++file_number[prefix]) + ".lyx"); } while (theBufferList().exists(filename) || filename.isReadableFile()); - + return newFile(filename.absFileName(), templatename, false); }