From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 1 Jun 2018 08:17:18 +0000 (+0200)
Subject: If a master is being created at loading the child, un-hide it.
X-Git-Tag: 2.3.2~39
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4a8b508d40021659290b84b83eaf29071de38f61;p=features.git

If a master is being created at loading the child, un-hide it.

Fixes: #11162
(cherry picked from commit a368439bcc3fbd18b4635d1b7c12da08b9315e2c)
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 6d0fd4f17d..583d3db52b 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1052,6 +1052,10 @@ bool Buffer::readDocument(Lexer & lex)
 						<< absFileName()
 						<< ") does not include "
 						"this document. Ignoring the master assignment.");
+				// If the master has just been created, un-hide it (#11162)
+				if (!master->fileName().exists())
+					lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
+								  master->absFileName()));
 			}
 		}
 	}
diff --git a/status.23x b/status.23x
index 654d099311..3091f06bd1 100644
--- a/status.23x
+++ b/status.23x
@@ -70,6 +70,8 @@ What's new
 
 - GuiCitation: Don't reset filter on show (bug 11291).
 
+- If a master is being created at loading the child, un-hide it (bug 11162).
+
 
 * DOCUMENTATION AND LOCALIZATION