From 143f2f5dccc81f0604b084039a987deac62c0894 Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Sat, 29 Dec 2018 00:23:26 -0500 Subject: [PATCH] Fix bug #11422. We need to load the master document before applying the params, since otherwise the TOC reset (and other things) happen before the master has been loaded (and set as parent). --- src/frontends/qt4/GuiDocument.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 7cdf4baef7..91a8241e5e 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -4490,10 +4490,9 @@ void GuiDocument::dispatchParams() // This must come first so that a language change is correctly noticed setLanguage(); - // Apply the BufferParams. Note that this will set the base class - // and then update the buffer's layout. - dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY, &buffer()); - + // We need to load the master before we formally update the params, + // since otherwise we run updateBuffer, etc, before the child's master + // has been set. if (!params().master.empty()) { FileName const master_file = support::makeAbsPath(params().master, support::onlyPath(buffer().absFileName())); @@ -4515,6 +4514,10 @@ void GuiDocument::dispatchParams() } } + // Apply the BufferParams. Note that this will set the base class + // and then update the buffer's layout. + dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY, &buffer()); + // Generate the colours requested by each new branch. BranchList & branchlist = params().branchlist(); if (!branchlist.empty()) { -- 2.39.5