From 3adfeaa2c71619e49370dba517e575e6183eeb2c Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 17 Jul 2006 15:21:54 +0000 Subject: [PATCH] * src/bufferlist.C (BufferList::close): Don't ignore unsaved changes if quitting == true (BufferList::close): Use menuWrite(buf) instead of buf->save(), because menuWrite tells the user if the file could not be saved and asks for another name git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14475 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/bufferlist.C | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/bufferlist.C b/src/bufferlist.C index c86abdc837..861bb6fb43 100644 --- 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()); -- 2.39.5