anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the following sort of crash, reported on the list. This is also

Browse Source 
#6884.

1. Open LyX. File>New. Document>Outline, to make sure the TOC is open.
That isn't necessary, but it helps you to see what is happening.
2. Create a section heading (alt-P, 2) with an x in it.
3. Split the screen.
4. File>New. You should now still see the TOC for the OLD buffer.
5. Click in the top screen. You now see an empty TOC (the one for the
empty buffer).
6. Click in the empty buffer. Other TOC!
7. Back to the "x" buffer. Empty TOC. Type something. Boom!

The problem is that teh setCurrentWorkArea() call eventually gets us to
structureChanged(), which accesses documentBufferView(). But that
doesn't get reset until later, and hence everything is out of sync.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35999 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-02 15:33:52 +00:00
parent 580a984e2c
commit efa0da26c8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1216,17 +1216,23 @@ void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
theGuiApp()->setCurrentView(this); theGuiApp()->setCurrentView(this);
d.current_work_area_ = wa; d.current_work_area_ = wa;
// We need to reset this now, because it will need to be
// right if the tabWorkArea gets reset in the for loop. We
// will change it back if we aren't in that case.
GuiWorkArea * const old_cmwa = d.current_main_work_area_;
d.current_main_work_area_ = wa;
for (int i = 0; i != d.splitter_->count(); ++i) { for (int i = 0; i != d.splitter_->count(); ++i) {
if (d.tabWorkArea(i)->setCurrentWorkArea(wa)) { if (d.tabWorkArea(i)->setCurrentWorkArea(wa)) {
//if (d.current_main_work_area_) LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea()
// d.current_main_work_area_->setFrameStyle(QFrame::NoFrame); << ", Current main wa: " << currentMainWorkArea());
d.current_main_work_area_ = wa;
//d.current_main_work_area_->setFrameStyle(QFrame::Box | QFrame::Plain);
//d.current_main_work_area_->setLineWidth(2);
LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea() << ", Current main wa: " << currentMainWorkArea());
return; return;
} }
} }
d.current_main_work_area_ = old_cmwa;
LYXERR(Debug::DEBUG, "This is not a tabbed wa"); LYXERR(Debug::DEBUG, "This is not a tabbed wa");
on_currentWorkAreaChanged(wa); on_currentWorkAreaChanged(wa);
BufferView & bv = wa->bufferView(); BufferView & bv = wa->bufferView();