Whitespace.

[lyx.git] / src / insets / InsetBranch.cpp

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index e966de29ea431eade918129e383227ce44966487..efdeea56a560bdbf9496063c56fac6da9a2ad8b0 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -33,6 +33,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
 #include "frontends/Application.h"
 
 #include <sstream>
@@ -105,11 +106,10 @@ docstring const InsetBranch::buttonLabel(BufferView const & bv) const
        docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 0x2716));
        if (inchild && master_selected != child_selected)
                symb += char_type(child_selected ? 0x2714 : 0x2716);
-       s = symb + s;
        if (decoration() == InsetLayout::CLASSIC)
-               return isOpen(bv) ? s : getNewLabel(s);
+               return symb + (isOpen(bv) ? s : getNewLabel(s));
        else
-               return params_.branch + ": " + getNewLabel(s);
+               return symb + params_.branch + ": " + getNewLabel(s);
 }
 
 
@@ -159,10 +159,19 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                        // call recordUndo..., because the master may be hidden, and
                        // the code presently assumes that hidden documents can never
                        // be dirty. See GuiView::closeBufferAll(), for example.
+                       // An option would be to check if the master is hidden.
+                       // If it is, unhide.
                        if (!master)
                                buffer().undo().recordUndoFullDocument(cur);
+                       else
+                               // at least issue a warning for now (ugly, but better than dataloss).
+                               frontend::Alert::warning(_("Branch state changes in master document"),
+                                   lyx::support::bformat(_("The state of the branch '%1$s' "
+                                       "was changed in the master file. "
+                                       "Please make sure to save the master."), params_.branch), true);
                        our_branch->setSelected(activate);
-                       cur.forceBufferUpdate();
+                       // cur.forceBufferUpdate() is not enough
+                       buf->updateBuffer();
                }
                break;
        }