Accept dirty buffer if the document has not been saved to disk (part of bug 6645).

[features.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 3f27588ce7edab5e037e6b1bb946ad0c4fadcba1..dc51c93835c394dd24fa8d272b2450cf2b8afe45 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -61,10 +61,12 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
        // File already open?
        Buffer * checkBuffer = theBufferList().getBuffer(filename);
        if (checkBuffer) {
-               // sometimes (when setting the master buffer from a child)
+               // Sometimes (when setting the master buffer from a child)
                // we accept a dirty buffer right away (otherwise we'd get
-               // an infinite loop (bug 5514)
-               if (checkBuffer->isClean() || acceptDirty)
+               // an infinite loop (bug 5514).
+               // We also accept a dirty buffer when the document has not
+               // yet been saved to disk.
+               if (checkBuffer->isClean() || acceptDirty || !filename.exists())
                        return checkBuffer;
                docstring const file = makeDisplayPath(filename.absFilename(), 20);
                docstring const text = bformat(_(
@@ -93,6 +95,8 @@ Buffer * checkAndLoadLyXFile(FileName const & filename, bool const acceptDirty)
                        return 0;
                }
                if (!b->loadLyXFile(filename)) {
+                       // do not save an emergency file when releasing the buffer
+                       b->markClean();
                        theBufferList().release(b);
                        return 0;
                }