mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-14 09:32:20 +00:00
branch: Fix bug #5998: Crash when closing a LyX window with split views.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30762 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5d2a712467
commit
06bb52c1af
@ -529,12 +529,22 @@ void GuiView::closeEvent(QCloseEvent * close_event)
|
|||||||
setFocus();
|
setFocus();
|
||||||
GuiWorkArea const * active_wa = currentWorkArea();
|
GuiWorkArea const * active_wa = currentWorkArea();
|
||||||
|
|
||||||
int splitter_count = d.splitter_->count();
|
// We might be in a situation that there is still a tabWorkArea, but
|
||||||
for (; splitter_count > 0; --splitter_count) {
|
// there are no tabs anymore. This can happen when we get here after a
|
||||||
TabWorkArea * twa = d.tabWorkArea(0);
|
// TabWorkArea::lastWorkAreaRemoved() signal. Therefore we count how
|
||||||
|
// many TabWorkArea's have no documents anymore.
|
||||||
|
int empty_twa = 0;
|
||||||
|
|
||||||
|
// 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() > empty_twa; ) {
|
||||||
|
TabWorkArea * twa = d.tabWorkArea(empty_twa);
|
||||||
|
|
||||||
int twa_count = twa->count();
|
int twa_count = twa->count();
|
||||||
for (; twa_count > 0; --twa_count) {
|
if (twa_count == 0)
|
||||||
|
++empty_twa;
|
||||||
|
|
||||||
|
for (; twa_count; --twa_count) {
|
||||||
twa->setCurrentIndex(twa_count-1);
|
twa->setCurrentIndex(twa_count-1);
|
||||||
|
|
||||||
GuiWorkArea * wa = twa->currentWorkArea();
|
GuiWorkArea * wa = twa->currentWorkArea();
|
||||||
|
Loading…
Reference in New Issue
Block a user