fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlCommand.C b/src/frontends/controllers/ControlCommand.C
index 054faec3eb1484315daecbe1fea56687748296a6..0fa8df22f8f6c62e0e8c3ab2cb899d2d1428ecb0 100644 (file)
--- a/src/frontends/controllers/ControlCommand.C
+++ b/src/frontends/controllers/ControlCommand.C
@@ -5,49 +5,52 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-
 #include "ControlCommand.h"
 
-#include "BufferView.h"
 #include "funcrequest.h"
-#include "lyxfunc.h"
+#include "insets/insetcommand.h"
 
 
-ControlCommand::ControlCommand(LyXView & lv, Dialogs & d, kb_action ac)
-       : ControlInset<InsetCommand, InsetCommandParams>(lv, d),
-         action_(ac)
-{}
+using std::string;
 
+namespace lyx {
+namespace frontend {
 
-InsetCommandParams const ControlCommand::getParams(string const & arg)
-{
-       InsetCommandParams params;
-       params.setFromString(arg);
-       return params;
-}
+ControlCommand::ControlCommand(Dialog & dialog, string const & lfun_name)
+       : Dialog::Controller(dialog),
+         lfun_name_(lfun_name)
+{}
 
 
-InsetCommandParams const ControlCommand::getParams(InsetCommand const & inset)
+bool ControlCommand::initialiseParams(string const & data)
 {
-       return inset.params();
+       // The name passed with LFUN_INSET_APPLY is also the name
+       // used to identify the mailer.
+       InsetCommandMailer::string2params(lfun_name_, data, params_);
+       return true;
 }
 
 
-void ControlCommand::applyParamsToInset()
+void ControlCommand::clearParams()
 {
-       inset()->setParams(params());
-       bufferview()->updateInset(inset(), true);
+       params_ = InsetCommandParams();
 }
 
 
-void ControlCommand::applyParamsNoInset()
+void ControlCommand::dispatchParams()
 {
-       if (action_ == LFUN_NOACTION)
+       if (lfun_name_.empty())
                return;
-       lyxfunc().dispatch(FuncRequest(action_, params().getAsString()));
+
+       string const lfun = InsetCommandMailer::params2string(lfun_name_,
+                                                             params_);
+       kernel().dispatch(FuncRequest(getLfun(), lfun));
 }
+
+} // namespace frontend
+} // namespace lyx