From 3f40bb1432e33731360bd01bcb5239d01672cdf3 Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Wed, 8 Dec 2010 20:55:24 +0000 Subject: [PATCH] At least prevent the crash in #7152. Patch by John McCabe-Dansted, more or less. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36780 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiView.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 6fb4f8af27..ea52c72711 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -1455,14 +1455,20 @@ void GuiView::disconnectBufferView() void GuiView::errors(string const & error_type, bool from_master) { + BufferView const * const bv = currentBufferView(); + if (!bv) + LASSERT(false, return); + ErrorList & el = from_master ? - currentBufferView()->buffer().masterBuffer()->errorList(error_type) - : currentBufferView()->buffer().errorList(error_type); + bv->buffer().masterBuffer()->errorList(error_type) : + bv->buffer().errorList(error_type); + if (el.empty()) + return; + string data = error_type; if (from_master) data = "from_master|" + error_type; - if (!el.empty()) - showDialog("errorlist", data); + showDialog("errorlist", data); }