From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 3 Mar 2011 13:57:46 +0000 (+0000)
Subject: Partial fix for bug #7330 (No error notification with 'View master document')
X-Git-Tag: 2.0.0~598
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b8cdbc7be8d3dd1017ce1ad22a4d8221fcf9bc50;p=features.git

Partial fix for bug #7330 (No error notification with 'View master document')
With this patch, the bug is fixed when export-in-thread is disabled.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37842 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp
index b3ab09f79f..6be1a6307d 100644
--- a/src/frontends/qt4/GuiErrorList.cpp
+++ b/src/frontends/qt4/GuiErrorList.cpp
@@ -119,11 +119,12 @@ void GuiErrorList::paramsToDialog()
 
 ErrorList const & GuiErrorList::errorList() const
 {
-	if (&bufferview()->buffer() == buf_) {
-		error_list_ = from_master_ ?
-			bufferview()->buffer().masterBuffer()->errorList(error_type_)
-			: bufferview()->buffer().errorList(error_type_);
-	}
+	Buffer const * buffer = from_master_
+				? bufferview()->buffer().masterBuffer()
+				: &bufferview()->buffer();
+	if (buffer == buf_)
+		error_list_ = buffer->errorList(error_type_);
+
 	return error_list_;
 }
 
@@ -159,10 +160,6 @@ bool GuiErrorList::goTo(int item)
 	if (err.par_id == -1)
 		return false;
 
-	if (from_master_)
-		// FIXME: implement
-		return false;
-
 	DocIterator dit = buf_->getParFromID(err.par_id);
 
 	if (dit == doc_iterator_end(buf_)) {