From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 23 Mar 2014 12:31:21 +0000 (+0100)
Subject: Do not allow the manual insertion of a directory (without filename) into the import... 
X-Git-Tag: 2.1.1~90^2~12
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=892da302d694ed19687776405791056372d6d13c;p=features.git

Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion.

Fixes: #7437(cherry picked from commit afd897029917a083fbeb84cccd4e6cb0a21db7ed)
---

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 28c6f3a40f..ae50045962 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2119,6 +2119,18 @@ void GuiView::importDocument(string const & argument)
 	// get absolute path of file
 	FileName const fullname(support::makeAbsPath(filename));
 
+	// Can happen if the user entered a path into the dialog
+	// (see bug #7437)
+	if (fullname.onlyFileName().empty()) {
+		docstring msg = bformat(_("The file name '%1$s' is invalid!\n"
+					  "Aborting import."),
+					from_utf8(fullname.absFileName()));
+		frontend::Alert::error(_("File name error"), msg);
+		message(_("Canceled."));
+		return;
+	}
+
+
 	FileName const lyxfile(support::changeExtension(fullname.absFileName(), ".lyx"));
 
 	// Check if the document already is open
diff --git a/status.21x b/status.21x
index cb44e134c8..ed6bd9555f 100644
--- a/status.21x
+++ b/status.21x
@@ -65,6 +65,8 @@ What's new
 
 - Fix crash when CheckTeX hits mathed (bug 8798).
 
+- Fix assertion when entering a path into the import dialog (bug 7437).
+
 - Failed instant preview compilation now returns an error. And a red box is 
   drawn around very small preview imagines, so they can be seen (bug 7522).