From 5c2dad7029f48a5b96c0131420633a9bd20f4783 Mon Sep 17 00:00:00 2001 From: Abdelrazak Younes Date: Wed, 30 Sep 2009 14:30:16 +0000 Subject: [PATCH] Fix crash noticed by Bennett: Open new document; LyX > Preferences; change anything; click on "Save" button --> Crash. Backtrace is below. Once again, this does not happen when no document is open. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31486 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiApplication.cpp | 1 + src/frontends/qt4/Menus.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 978228f70a..6b0a78adaa 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -1026,6 +1026,7 @@ void GuiApplication::resetGui() QHash::iterator it; for (it = d->views_.begin(); it != d->views_.end(); ++it) { GuiView * gv = *it; + setCurrentView(gv); gv->setLayoutDirection(layoutDirection()); gv->resetDialogs(); } diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index b1e06fc00d..c916fb8bf6 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -781,7 +781,8 @@ void MenuDefinition::expandDocuments() QString label = toqstr(b->fileName().displayName(20)); if (!b->isClean()) label += "*"; - bool const shown = guiApp->currentView()->workArea(*b); + bool const shown = guiApp->currentView() + ? guiApp->currentView()->workArea(*b) : false; int ii = shown ? vis : invis; if (ii < 10) label = QString::number(ii) + ". " + label + '|' + QString::number(ii); -- 2.39.5