fix crash due to invalidated iterator

[lyx.git] / src / frontends / controllers / ControlBranch.C

diff --git a/src/frontends/controllers/ControlBranch.C b/src/frontends/controllers/ControlBranch.C
index ef0ed85970037cf546003b4c7a949732d701eabd..1b656b542ccf19723befcdce985e5348fd5edece 100644 (file)
--- a/src/frontends/controllers/ControlBranch.C
+++ b/src/frontends/controllers/ControlBranch.C
@@ -12,9 +12,19 @@
 #include <config.h>
 
 #include "ControlBranch.h"
+
+#include "buffer.h"
+#include "bufferparams.h"
+#include "BranchList.h"
 #include "funcrequest.h"
 #include "insets/insetbranch.h"
-#include "debug.h"
+
+
+using std::string;
+using std::vector;
+
+namespace lyx {
+namespace frontend {
 
 ControlBranch::ControlBranch(Dialog & parent)
        : Dialog::Controller(parent)
@@ -26,7 +36,7 @@ bool ControlBranch::initialiseParams(string const & data)
        InsetBranchParams params;
        InsetBranchMailer::string2params(data, params);
        params_.reset(new InsetBranchParams(params));
-       
+
        return true;
 }
 
@@ -38,7 +48,15 @@ void ControlBranch::clearParams()
 
 void ControlBranch::dispatchParams()
 {
-       string const lfun = InsetBranchMailer::params2string(string("branch"), params());
-       kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+       string const lfun = InsetBranchMailer::params2string(params());
+       kernel().dispatch(FuncRequest(getLfun(), lfun));
+}
+
+
+BranchList const & ControlBranch::branchlist() const
+{
+       return kernel().buffer().params().branchlist();
 }
 
+} // namespace frontend
+} // namespace lyx