From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Wed, 8 Jul 2009 21:37:37 +0000 (+0000)
Subject: Fix bug #5998.
X-Git-Tag: 2.0.0~6132
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=93feef62b83b3bfdb882c9ff778d8cb20cbb1c6d;p=features.git

Fix bug #5998.

When one document has a split view, closing this document will close two splitters at a time.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30416 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c78a068978..c22fb322c5 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -538,8 +538,9 @@ void GuiView::closeEvent(QCloseEvent * close_event)
 	GuiWorkArea * active_wa = currentMainWorkArea();
 	setCurrentWorkArea(active_wa);
 
-	int splitter_count = d.splitter_->count();
-	for (; splitter_count; --splitter_count) {
+	// We have to call count() each time, because it can happen that
+	// more than one splitter will disappear in one iteration (bug 5998).
+	for (; d.splitter_->count(); ) {
 		TabWorkArea * twa = d.tabWorkArea(0);
 				
 		int twa_count = twa->count();