[rkward/frameworks] rkward/misc: Don't fill in default path for empty file selections.

[Thomas Friedrichsmeier]

Git commit 59214620d4ecc4c2341b5508b988966f8bdca609 by Thomas Friedrichsmeier.
Committed on 14/09/2016 at 16:18.
Pushed by tfry into branch 'frameworks'.

Don't fill in default path for empty file selections.

M  +17   -15   rkward/misc/getfilenamewidget.cpp

http://commits.kde.org/rkward/59214620d4ecc4c2341b5508b988966f8bdca609

diff --git a/rkward/misc/getfilenamewidget.cpp b/rkward/misc/getfilenamewidget.cpp
index 387039f..a1e3cb1 100644
--- a/rkward/misc/getfilenamewidget.cpp
+++ b/rkward/misc/getfilenamewidget.cpp
@@ -61,22 +61,24 @@ GetFileNameWidget::GetFileNameWidget (QWidget *parent, FileType mode, bool only_
 	if (only_local) mode_flags |= KFile::LocalOnly;
 	edit->setMode (mode_flags);
 
-	QString append = initial;
-	if (initial.startsWith ('<')) {
-		storage_key = initial.section ('>', 0, 0).mid (1);
-		append = initial.section ('>', 1);
-	}
-	QUrl initial_url = RKSettingsModuleGeneral::lastUsedUrlFor (storage_key);  // storage_key == QString () in the default case is intended
-	if (!append.isEmpty ()) {
-		if (initial_url.isLocalFile ()) {
-			initial_url = QUrl::fromUserInput (append, initial_url.toLocalFile (), QUrl::AssumeLocalFile);
-		} else {
-			initial_url.setPath (initial_url.path () + '/' + append);
+	if (!initial.isEmpty ()) {
+		QString append = initial;
+		if (initial.startsWith ('<')) {
+			storage_key = initial.section ('>', 0, 0).mid (1);
+			append = initial.section ('>', 1);
+		}
+		QUrl initial_url = RKSettingsModuleGeneral::lastUsedUrlFor (storage_key);  // storage_key == QString () in the default case is intended
+		if (!append.isEmpty ()) {
+			if (initial_url.isLocalFile ()) {
+				initial_url = QUrl::fromUserInput (append, initial_url.toLocalFile (), QUrl::AssumeLocalFile);
+			} else {
+				initial_url.setPath (initial_url.path () + '/' + append);
+			}
+			initial_url = initial_url.adjusted (QUrl::NormalizePathSegments);
+		}
+		if (initial_url.isLocalFile () || !only_local) {
+			edit->setUrl (initial_url);
 		}
-		initial_url = initial_url.adjusted (QUrl::NormalizePathSegments);
-	}
-	if (initial_url.isLocalFile () || !only_local) {
-		edit->setUrl (initial_url);
 	}
 	connect (edit, &KUrlRequester::textChanged, this, &GetFileNameWidget::locationEditChanged);
 	connect (edit, &KUrlRequester::urlSelected, this, &GetFileNameWidget::updateLastUsedUrl);