anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/bufferlist.C

Browse Source 
(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
This commit is contained in:
Georg Baum 2006-07-17 15:21:54 +00:00
parent 04986c096a
commit 3adfeaa2c7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/bufferlist.C
View File

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