Fix #1183 by adding a workaround for srzip handling

[pulseview.git] / pv / toolbars / mainbar.cpp

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index b798683c33a0fee228553501cadd528c48704a41..28ea0042227a6119890329208bdeedacc5277def 100644 (file)
--- 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());
 }