projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Android: Bundle Qt libs with the APK
[pulseview.git]
/
pv
/
dialogs
/
storeprogress.cpp
diff --git
a/pv/dialogs/storeprogress.cpp
b/pv/dialogs/storeprogress.cpp
index e0f670d325d7e71bee51ad2c36db1cb78d0e415e..5c2d8bc16cf0952a61c14736da031209475875e6 100644
(file)
--- a/
pv/dialogs/storeprogress.cpp
+++ b/
pv/dialogs/storeprogress.cpp
@@
-18,6
+18,10
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
+#include <QMessageBox>
+
#include "storeprogress.h"
namespace pv {
#include "storeprogress.h"
namespace pv {
@@
-62,20
+66,18
@@
void StoreProgress::closeEvent(QCloseEvent*)
void StoreProgress::on_progress_updated()
{
void StoreProgress::on_progress_updated()
{
- const std::pair<
uint64_t, uint64_
t> p = _session.progress();
+ const std::pair<
int, in
t> p = _session.progress();
assert(p.first <= p.second);
assert(p.first <= p.second);
- setValue(p.first);
- setMaximum(p.second);
-
- const QString err = _session.error();
- if (!err.isEmpty()) {
- show_error();
+ if (p.second) {
+ setValue(p.first);
+ setMaximum(p.second);
+ } else {
+ const QString err = _session.error();
+ if (!err.isEmpty())
+ show_error();
close();
}
close();
}
-
- if (p.first == p.second)
- close();
}
} // dialogs
}
} // dialogs