Continue work on SRD_OUTPUT_LOGIC

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

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index 0d0a222c2cc5594dc875dfcd0473b169a8c5dd0f..8699ccefdfbcca6fe2bae451f9c34072d0848717 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,7 +43,8 @@ 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()));
@@ -78,9 +80,12 @@ 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();
@@ -107,9 +112,8 @@ void StoreProgress::on_progress_updated()
                setMaximum(p.second);
        } else {
                const QString err = session_.error();
-               if (!err.isEmpty())
+               if (!err.isEmpty() && !showing_error_)
                        show_error();
-               close();
        }
 }