revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / bufferlist.C

diff --git a/src/bufferlist.C b/src/bufferlist.C
index c86abdc837bf1af76fa2b204cf7b715d9ce11498..861bb6fb43bab197ca981a2d719775cadd28f3f5 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -173,8 +173,7 @@ bool BufferList::close(Buffer * buf, bool const ask)
 {
        BOOST_ASSERT(buf);
 
-       // FIXME: is the quitting check still necessary ?
-       if (!ask || buf->isClean() || quitting || buf->paragraphs().empty()) {
+       if (!ask || buf->isClean() || buf->paragraphs().empty()) {
                release(buf);
                return true;
        }
@@ -195,14 +194,12 @@ bool BufferList::close(Buffer * buf, bool const ask)
                if (buf->isUnnamed()) {
                        if (!writeAs(buf))
                                return false;
-               } else if (buf->save()) {
-                       LyX::ref().session().addLastFile(buf->fileName());
-               } else {
+               } else if (!menuWrite(buf))
                        return false;
-               }
-       } else if (ret == 2) {
+               else
+                       return false;
+       } else if (ret == 2)
                return false;
-       }
 
        if (buf->isUnnamed()) {
                removeAutosaveFile(buf->fileName());