From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 23 Nov 2013 15:51:16 +0000 (+0100)
Subject: Do not attempt to set default master if we already have a parent
X-Git-Tag: 2.1.0rc1~398
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cb699fbc1c540006bae16ff62f0b48dce52a5520;p=features.git

Do not attempt to set default master if we already have a parent
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 0ac68c8db7..b8719cbf16 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -933,7 +933,7 @@ bool Buffer::readDocument(Lexer & lex)
 		}
 	}
 
-	if (!params().master.empty()) {
+	if (!parent() && !params().master.empty()) {
 		FileName const master_file = makeAbsPath(params().master,
 			   onlyPath(absFileName()));
 		if (isLyXFileName(master_file.absFileName())) {