X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.cpp;h=9f4279cea8557a20423c799f0f6abe5785e142ee;hp=bd99cbadcfed4cc4a18d6069fb13d83e9591455f;hb=1df756a190693295995a938e64333ddbda4ca3cf;hpb=efdec55aec1a137460fa362a381ed1904182bfed

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index bd99cbad..9f4279ce 100644
--- a/pv/dialogs/storeprogress.cpp
+++ b/pv/dialogs/storeprogress.cpp
@@ -19,11 +19,16 @@
 
 #include <cassert>
 
+#include <QDebug>
 #include <QMessageBox>
 
+#include "pv/session.hpp"
+
 #include "storeprogress.hpp"
 
 using std::map;
+using std::pair;
+using std::shared_ptr;
 using std::string;
 
 using Glib::VariantBase;
@@ -32,9 +37,9 @@ namespace pv {
 namespace dialogs {
 
 StoreProgress::StoreProgress(const QString &file_name,
-	const std::shared_ptr<sigrok::OutputFormat> output_format,
+	const shared_ptr<sigrok::OutputFormat> output_format,
 	const map<string, VariantBase> &options,
-	const std::pair<uint64_t, uint64_t> sample_range,
+	const pair<uint64_t, uint64_t> sample_range,
 	const Session &session, QWidget *parent) :
 	QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
 	session_(file_name.toStdString(), output_format, options, sample_range,
@@ -42,6 +47,21 @@ StoreProgress::StoreProgress(const QString &file_name,
 {
 	connect(&session_, SIGNAL(progress_updated()),
 		this, SLOT(on_progress_updated()));
+	connect(&session_, SIGNAL(store_successful()),
+		&session, SLOT(on_data_saved()));
+
+	// Since we're not setting any progress in case of an error, the dialog
+	// will pop up after the minimumDuration time has been reached - 4000 ms
+	// by default.
+	// We do not want this as it overlaps with the error message box, so we
+	// set the minimumDuration to 0 so that it only appears when we feed it
+	// progress data. Then, call reset() to prevent the progress dialog from
+	// popping up anyway. This would happen in Qt5 because the behavior was
+	// changed in such a way that the duration timer is started by the
+	// constructor. We don't want that and reset() stops the timer, so we
+	// use it.
+	setMinimumDuration(0);
+	reset();
 }
 
 StoreProgress::~StoreProgress()
@@ -59,22 +79,30 @@ void StoreProgress::run()
 
 void StoreProgress::show_error()
 {
+	qDebug() << "Error trying to save:" << session_.error();
+
 	QMessageBox msg(parentWidget());
 	msg.setText(tr("Failed to save session."));
 	msg.setInformativeText(session_.error());
 	msg.setStandardButtons(QMessageBox::Ok);
 	msg.setIcon(QMessageBox::Warning);
 	msg.exec();
+
+	close();
 }
 
 void StoreProgress::closeEvent(QCloseEvent*)
 {
 	session_.cancel();
+
+	// Closing doesn't mean we're going to be destroyed because our parent
+	// still owns our handle. Make sure this stale instance doesn't hang around.
+	deleteLater();
 }
 
 void StoreProgress::on_progress_updated()
 {
-	const std::pair<int, int> p = session_.progress();
+	const pair<int, int> p = session_.progress();
 	assert(p.first <= p.second);
 
 	if (p.second) {
@@ -88,5 +116,5 @@ void StoreProgress::on_progress_updated()
 	}
 }
 
-} // dialogs
-} // pv
+}  // namespace dialogs
+}  // namespace pv