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

Fix bug #6464: Crash when exiting LyX from second window when first window has changed buffer.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33579 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-02-26 14:07:21 +00:00
parent f31298fd7c
commit 4aeca63887
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1032,16 +1032,16 @@ GuiWorkArea * GuiView::currentWorkArea()
GuiWorkArea const * GuiView::currentMainWorkArea() const
{
if (d.currentTabWorkArea() == NULL)
return NULL;
if (!d.currentTabWorkArea())
return 0;
return d.currentTabWorkArea()->currentWorkArea();
}
GuiWorkArea * GuiView::currentMainWorkArea()
{
if (d.currentTabWorkArea() == NULL)
return NULL;
if (!d.currentTabWorkArea())
return 0;
return d.currentTabWorkArea()->currentWorkArea();
}
@ -1049,13 +1049,17 @@ GuiWorkArea * GuiView::currentMainWorkArea()
void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
{
LYXERR(Debug::DEBUG, "Setting current wa: " << wa << endl);
if (wa == NULL) {
d.current_work_area_ = NULL;
if (!wa) {
d.current_work_area_ = 0;
d.setBackground();
return;
}
GuiWorkArea * old_gwa = theGuiApp()->currentView()->currentWorkArea();
if (old_gwa == wa)
// FIXME: I've no clue why this is here and why it accesses
// theGuiApp()->currentView, which might be 0 (bug 6464).
// See also 27525 (vfr).
if (theGuiApp()->currentView() == this
&& theGuiApp()->currentView()->currentWorkArea() == wa)
return;
if (currentBufferView())