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

Closing the children of a master can be done in closeWorkArea.

Browse Source 
This fixes yet another bug. Previously, when a master was closed, its child buffers were also released without asking to save dirty buffers. (What a mess!).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31104 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2009-08-17 21:25:27 +00:00
parent c801404b4c
commit c76fca43bc
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/frontends/qt4/GuiView.cpp
View File

@ -619,19 +619,6 @@ bool GuiView::closeBufferAll(bool tolastopened)
continue;
}
vector<Buffer *> clist = b.getChildren();
for (vector<Buffer *>::const_iterator it = clist.begin();
it != clist.end(); ++it) {
if ((*it)->isClean())
continue;
Buffer * c = *it;
// If a child is dirty, do not close
// without user intervention
//FIXME: should buffers be closed or not?
if (!closeWorkArea(workArea(*c), false, false))
return false;
}
// We only want to close the buffer if the same buffer is not in
// another view.
bool const close_buffer = !inMultiViews(wa);
@ -1933,6 +1920,21 @@ bool GuiView::closeBuffer()
bool GuiView::closeWorkArea(GuiWorkArea * wa, bool close_buffer,
bool tolastopened, bool mark_active)
{
Buffer & buf = wa->bufferView().buffer();
if (close_buffer && !tolastopened) {
vector<Buffer *> clist = buf.getChildren();
for (vector<Buffer *>::const_iterator it = clist.begin();
it != clist.end(); ++it) {
// If a child is dirty, do not close
// without user intervention
//FIXME: should buffers be closed or not?
//FIXME: should we look in other tabworkareas?
GuiWorkArea * child_wa = workArea(**it);
if (child_wa && !closeWorkArea(child_wa, !close_buffer, false))
return false;
}
}
// goto bookmark to update bookmark pit.
//FIXME: we should update only the bookmarks related to this buffer!
LYXERR(Debug::DEBUG, "GuiView::closeBuffer()");
@ -1943,7 +1945,6 @@ bool GuiView::closeWorkArea(GuiWorkArea * wa, bool close_buffer,
// of the buffer, then we do not need to ensure a clean buffer.
bool const allow_dirty = inMultiTabs(wa) && !close_buffer;
Buffer & buf = wa->bufferView().buffer();
if (allow_dirty || saveBufferIfNeeded(buf, !close_buffer)) {
// save in sessions if requested
// do not save childs if their master