From 942538c02d840753e16981636998e0c60c752b73 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sat, 22 Jan 2022 09:30:25 +0100 Subject: [PATCH] Fix bug 12459 When checking for branch color, take into account that some branches are defined in the master document only, some only in the child. --- src/insets/InsetBranch.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index 66cc6ef552..be8e551747 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -136,9 +136,11 @@ ColorCode InsetBranch::backgroundColor(PainterInfo const & pi) const { if (params_.branch.empty()) return Inset::backgroundColor(pi); + string const branch_id = (buffer().masterParams().branchlist().find(params_.branch)) + ? convert(buffer().masterParams().branchlist().id()) + : convert(buffer().params().branchlist().id()); // FIXME UNICODE - string const branchcol = "branch" + convert(buffer().params().branchlist().id()) - + to_utf8(params_.branch); + string const branchcol = "branch" + branch_id + to_utf8(params_.branch); ColorCode c = lcolor.getFromLyXName(branchcol); if (c == Color_none) c = Color_error; -- 2.39.2