fix crash due to invalidated iterator

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

diff --git a/src/frontends/controllers/ControlInclude.C b/src/frontends/controllers/ControlInclude.C
index d09bf7ac3cc7e0a40dc2d6dc2a5e7460ed8c3ae8..92e5e50a2d74b277a6f54d6689f9316bd7f10828 100644 (file)
--- a/src/frontends/controllers/ControlInclude.C
+++ b/src/frontends/controllers/ControlInclude.C
@@ -24,8 +24,8 @@
 
 #include "insets/insetinclude.h"
 
+#include "support/filefilterlist.h"
 #include "support/filetools.h"
-#include "support/globbing.h"
 
 #include <utility>
 
@@ -62,7 +62,7 @@ void ControlInclude::clearParams()
 void ControlInclude::dispatchParams()
 {
        string const lfun = InsetIncludeMailer::params2string(params_);
-       kernel().dispatch(FuncRequest(LFUN_INSET_APPLY, lfun));
+       kernel().dispatch(FuncRequest(getLfun(), lfun));
 }
 
 
@@ -99,8 +99,8 @@ string const ControlInclude::browse(string const & in_name, Type in_type) const
 
 void ControlInclude::load(string const & file)
 {
-       string const format = support::getFormatFromContents(file);
-       if (format == "lyx")
+       string const ext = support::GetExtension(file);
+       if (ext == "lyx")
                kernel().dispatch(FuncRequest(LFUN_CHILDOPEN, file));
        else
                // tex file or other text file in verbatim mode