The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit dbb1ac30e9a87007af7c53f0f93ec9e21826f90b
Merge: f881835 7da8d99
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Oct 1 12:37:33 2012 +0200
Merge branch 'master' of git.lyx.org:lyx
commit f881835da210fa98d822010c3c9afae4d65d5572
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Oct 1 12:37:16 2012 +0200
Ask for saving changes when branch state in child was altered
diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index e966de2..db047c2 100644
--- 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>
@@ -159,10 +160,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;
}
-----------------------------------------------------------------------
Summary of changes:
src/insets/InsetBranch.cpp | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
hooks/post-receive
--
The LyX Source Repository
