From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Sun, 2 Sep 2018 01:47:23 +0000 (-0400)
Subject: Revert "Use separate BibInfo for child"
X-Git-Tag: 2.3.1~3
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6dc9e5aa333e032617862c54b2d913f838b94571;p=features.git

Revert "Use separate BibInfo for child"

This reverts commit cfce0ac009e8820df79d845c2b0c237cbd441dcb.
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index b41ddc45d3..4d527422e3 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2358,7 +2358,7 @@ BiblioInfo const & Buffer::bibInfo() const
 void Buffer::registerBibfiles(FileNamePairList const & bf) const {
 	Buffer const * const tmp = masterBuffer();
 	if (tmp != this)
-		tmp->registerBibfiles(bf);
+		return tmp->registerBibfiles(bf);
 
 	for (auto const & p : bf) {
 		FileNamePairList::const_iterator tmp =
@@ -2429,6 +2429,9 @@ void Buffer::collectBibKeys(FileNameList & checkedFiles) const
 
 void Buffer::addBiblioInfo(BiblioInfo const & bin) const
 {
+	// We add the biblio info to the master buffer,
+	// if there is one, but also to every single buffer,
+	// in case a child is compiled alone.
 	BiblioInfo & bi = d->bibinfo_;
 	bi.mergeBiblioInfo(bin);