From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Wed, 7 Jan 2009 11:07:48 +0000 (+0000)
Subject: * Buffer.cpp:
X-Git-Tag: 2.0.0~7488
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a4a108e602670cf4daa151c1451d5aed6223890;p=features.git

* Buffer.cpp:
	- prevent potential null pointer.

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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index beec8ff9e8..2552c93265 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -592,7 +592,7 @@ bool Buffer::readDocument(Lexer & lex)
 				checkAndLoadLyXFile(master_file, true);
 			// set master as master buffer, but only if we are
 			// a real child
-			if (master->isChild(this))
+			if (master && master->isChild(this))
 				d->parent_buffer = master;
 			else
 				LYXERR0("The master '"