X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormInclude.C;h=636574b121c51444b9c75c75c1a59a348c1d4714;hb=27652900a60fd078f161ce866ddaed21dba21eff;hp=42015d2d3e15da46964ef74baefe8278fc38e35b;hpb=79327ea1ad2b1b9e074685c737102252b556a2f7;p=lyx.git

diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index 42015d2d3e..636574b121 100644
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -90,8 +90,11 @@ void FormInclude::apply()
 {
 	controller().params().noload = fl_get_button(dialog_->check_typeset);
 
-	controller().params().cparams.
-		setContents(fl_get_input(dialog_->input_filename));
+	string const file = fl_get_input(dialog_->input_filename);
+	if (controller().fileExists(file))
+	    controller().params().cparams.setContents(file);
+	else
+	    controller().params().cparams.setContents("");
 
 	if (fl_get_button(dialog_->check_useinput))
 		controller().params().flag = InsetInclude::INPUT;
@@ -127,8 +130,10 @@ ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
 
 	} else if (ob == dialog_->button_load) {
 		string const in_name = fl_get_input(dialog_->input_filename);
-		if (!strip(in_name).empty()) {
-			ApplyButton();
+		if (!strip(in_name).empty() && controller().fileExists(in_name)) {
+//			ApplyButton();
+			OKButton();
+			controller().load(strip(in_name));
 			action = ButtonPolicy::SMI_NOOP;
 		}