]> git.lyx.org Git - features.git/commitdiff
Do not attempt to set default master if we already have a parent
authorJuergen Spitzmueller <spitz@lyx.org>
Sat, 23 Nov 2013 15:51:16 +0000 (16:51 +0100)
committerJuergen Spitzmueller <spitz@lyx.org>
Sat, 23 Nov 2013 15:51:16 +0000 (16:51 +0100)
src/Buffer.cpp

index 0ac68c8db70b5d1e49b0d24afd0595916440a85d..b8719cbf164a84bf4ec41c81b508203785214e50 100644 (file)
@@ -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())) {