From: Richard Heck <rgheck@comcast.net>
Date: Mon, 18 Jul 2011 13:57:15 +0000 (+0000)
Subject: Fix recursive include check.
X-Git-Tag: 2.1.0beta1~2901
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f49cdf34201f3e0d23898259a2966bd9e38e6c53;p=features.git

Fix recursive include check.

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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6c3841ba63..df5811c8f0 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2640,12 +2640,6 @@ void Buffer::collectChildren(ListOfBuffers & clist, bool grand_children) const
 			// there might be grandchildren
 			child->collectChildren(clist, true);
 	}
-	// Make sure we have not included ourselves.
-	ListOfBuffers::iterator bit = find(clist.begin(), clist.end(), this);
-	if (bit != clist.end()) {
-		LYXERR0("Recursive include detected in `" << fileName() << "'.");
-		clist.erase(bit);
-	}
 }
 
 
@@ -2653,6 +2647,12 @@ ListOfBuffers Buffer::getChildren() const
 {
 	ListOfBuffers v;
 	collectChildren(v, false);
+	// Make sure we have not included ourselves.
+	ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
+	if (bit != v.end()) {
+		LYXERR0("Recursive include detected in `" << fileName() << "'.");
+		v.erase(bit);
+	}
 	return v;
 }
 
@@ -2661,6 +2661,12 @@ ListOfBuffers Buffer::getDescendents() const
 {
 	ListOfBuffers v;
 	collectChildren(v, true);
+	// Make sure we have not included ourselves.
+	ListOfBuffers::iterator bit = find(v.begin(), v.end(), this);
+	if (bit != v.end()) {
+		LYXERR0("Recursive include detected in `" << fileName() << "'.");
+		v.erase(bit);
+	}
 	return v;
 }