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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index b3c1d85acbca364a2e863f9e0941c21ce4ddde25..bb838ef2612ff966814d572eb8285b767a57023f 100644 (file)
--- 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();
 }