X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=28ea0042227a6119890329208bdeedacc5277def;hp=b798683c33a0fee228553501cadd528c48704a41;hb=73d5a9bbc2f32ed84077ca4e75a125a6b0fc1921;hpb=e6d85b8936b5b7aee80b03834f095fd5b52fe6f4

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index b798683c..28ea0042 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -689,11 +689,10 @@ void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only,
 	}
 
 	if (!selection_only) {
-		session_.set_name(QFileInfo(file_name).fileName());
-
-		if (format == session_.device_manager().context()->output_formats()["srzip"])
+		if (format == session_.device_manager().context()->output_formats()["srzip"]) {
 			session_.set_save_path(QFileInfo(file_name).absolutePath());
-		else
+			session_.set_name(QFileInfo(file_name).fileName());
+		} else
 			session_.set_save_path("");
 	}
 
@@ -825,7 +824,7 @@ void MainBar::on_actionSave_triggered()
 		return;
 	}
 
-	QFileInfo fi = QFileInfo(session_.save_path(), session_.name());
+	QFileInfo fi = QFileInfo(QDir(session_.save_path()), session_.name());
 	export_file(session_.device_manager().context()->output_formats()["srzip"], false,
 		fi.absoluteFilePath());
 }