* 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

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index f47d40459b8d10ac043f3a3b9be8adc6b1290127..5d94999f11534e87a0d041c8417a9485e129f219 100644 (file)
--- 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");