From 29ff62face3da8b578882cbbb37794619d0d0a21 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Sat, 11 Jul 2009 00:10:18 +0000 Subject: [PATCH] Fix status check of branch (de)activation from the child, when master has no info about that branch. Context menu still does not work. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30457 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/insets/InsetBranch.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index b3c1d85acb..bb838ef261 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -205,8 +205,13 @@ bool InsetBranch::isBranchSelected() const Buffer const & realbuffer = *buffer().masterBuffer(); BranchList const & branchlist = realbuffer.params().branchlist(); Branch const * ourBranch = branchlist.find(params_.branch); - if (!ourBranch) - return false; + + if (!ourBranch) { + // this branch is defined in child only + ourBranch = buffer().params().branchlist().find(params_.branch); + if (!ourBranch) + return false; + } return ourBranch->isSelected(); } -- 2.39.2