From 73a4394e9725b2d7f306c3e9e04ac555dbfe3d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Sun, 4 Oct 2009 14:35:12 +0000
Subject: [PATCH] * GuiView.cpp (reloadBuffer): 	- adjust r31510 to prevent
 null pointer.

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

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index f47d40459b..5d94999f11 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2253,11 +2253,11 @@ void GuiView::reloadBuffer()
 	buf = loadDocument(filename);
 	docstring const disp_fn = makeDisplayPath(filename.absFilename());
 	docstring str;
-	// re-allocate master if necessary
-	if (is_child && theBufferList().isLoaded(master)
-	    && buf->masterBuffer() != master)
-		buf->setParent(master);
 	if (buf) {
+		// re-allocate master if necessary
+		if (is_child && theBufferList().isLoaded(master)
+		    && buf->masterBuffer() != master)
+			buf->setParent(master);
 		buf->updateLabels();
 		setBuffer(buf);
 		buf->errors("Parse");