Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / dialogs / storeprogress.cpp

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index 09b6b0f4ca61236f90815a90b7a1337faba837cf..0bcfbf2c75ca772510068b0309a4053e74fef5a3 100644 (file)
--- a/pv/dialogs/storeprogress.cpp
+++ b/pv/dialogs/storeprogress.cpp
@@ -19,6 +19,7 @@
 
 #include <cassert>
 
+#include <QDebug>
 #include <QMessageBox>
 
 #include "pv/session.hpp"
@@ -42,12 +43,27 @@ StoreProgress::StoreProgress(const QString &file_name,
        const Session &session, QWidget *parent) :
        QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
        session_(file_name.toStdString(), output_format, options, sample_range,
-               session)
+               session),
+       showing_error_(false)
 {
        connect(&session_, SIGNAL(progress_updated()),
                this, SLOT(on_progress_updated()));
        connect(&session_, SIGNAL(store_successful()),
                &session, SLOT(on_data_saved()));
+       connect(this, SIGNAL(canceled()), this, SLOT(on_cancel()));
+
+       // 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()
@@ -65,17 +81,26 @@ void StoreProgress::run()
 
 void StoreProgress::show_error()
 {
+       showing_error_ = true;
+
+       qDebug() << "Error trying to save:" << session_.error();
+
        QMessageBox msg(parentWidget());
-       msg.setText(tr("Failed to save session."));
-       msg.setInformativeText(session_.error());
+       msg.setText(tr("Failed to save session.") + "\n\n" + 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()
@@ -88,11 +113,17 @@ void StoreProgress::on_progress_updated()
                setMaximum(p.second);
        } else {
                const QString err = session_.error();
-               if (!err.isEmpty())
+               if (err.isEmpty())
+                       close();
+               else if (!showing_error_)
                        show_error();
-               close();
        }
 }
 
+void StoreProgress::on_cancel()
+{
+       session_.cancel();
+}
+
 }  // namespace dialogs
 }  // namespace pv