From c04850645e6874e1cbc59730b228c7b4a2def979 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Fri, 1 Jan 2010 03:11:56 +0000
Subject: [PATCH] When reloading a child document, reset the parent of the
 child to the parent of the child and not to the master.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32738 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiView.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 0644c7c0bc..2f7eb4aa18 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -697,7 +697,7 @@ void GuiView::dropEvent(QDropEvent * event)
 			cmd = FuncRequest(LFUN_FILE_OPEN, file);
 		}
 
-		// Asynchronously post the event. DropEvent usually come
+		// Asynchronously post the event. DropEvent usually comes
 		// from the BufferView. But reloading a file might close
 		// the BufferView from within its own event handler.
 		guiApp->dispatchDelayed(cmd);
@@ -2413,8 +2413,8 @@ void GuiView::reloadBuffer()
 void GuiView::reloadBuffer(Buffer * buf)
 {
 	FileName filename = buf->fileName();
-	Buffer const * master = buf->masterBuffer();
-	bool const is_child = master != buf;
+	Buffer const * parent = buf->parent();
+	bool const is_child = parent != buf;
 	// The user has already confirmed that the changes, if any, should
 	// be discarded. So we just release the Buffer and don't call closeBuffer();
 	theBufferList().release(buf);
@@ -2423,9 +2423,9 @@ void GuiView::reloadBuffer(Buffer * buf)
 	docstring str;
 	if (buf) {
 		// re-allocate master if necessary
-		if (is_child && theBufferList().isLoaded(master)
-		    && buf->masterBuffer() != master)
-			buf->setParent(master);
+		if (is_child && theBufferList().isLoaded(parent)
+		      && buf->parent() != parent)
+			buf->setParent(parent);
 		buf->updateLabels();
 		setBuffer(buf);
 		buf->errors("Parse");