From bd934ddf3e44a52cbf68c6ef50c79a517a909ab1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Wed, 7 Jan 2009 07:53:28 +0000 Subject: [PATCH] * Buffer.cpp: - do not set master_file as master buffer if the document s no real child (bug 5653). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28020 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Buffer.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 464ae43937..beec8ff9e8 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -588,8 +588,17 @@ bool Buffer::readDocument(Lexer & lex) FileName const master_file = makeAbsPath(params().master, onlyPath(absFileName())); if (isLyXFilename(master_file.absFilename())) { - Buffer * master = checkAndLoadLyXFile(master_file, true); - d->parent_buffer = master; + Buffer * master = + checkAndLoadLyXFile(master_file, true); + // set master as master buffer, but only if we are + // a real child + if (master->isChild(this)) + d->parent_buffer = master; + else + LYXERR0("The master '" + << params().master + << "' assigned to this document does not include " + "this document. Ignoring the master assignment."); } } -- 2.39.2