Dark98/threeSD
1
0
Fork 0
mirror of https://github.com/Dark98/threeSD.git synced 2026-07-06 08:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

import_dialog: Fix Qt weirdty with ProgressDialog

Browse Source 
Hopefully fixes #11

There are times when file writes can be *really* fast (for instance if you just deleted the same file). With modal progress dialogs, Qt call processEvents on setValue. If the operation is done too fast, a new signal would have arrived by this time. This can lead to stack overflow caused by overly deep recursion.
This commit is contained in:
zhupengfei
2020-08-27 00:52:35 +08:00
parent b06440aefb
commit e238015e82
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/import_dialog.cpp
+14 -10
View File
@@ -10,6 +10,7 @@
#include <QFutureWatcher> #include <QFutureWatcher>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QProgressBar>
#include <QProgressDialog> #include <QProgressDialog>
#include <QPushButton> #include <QPushButton>
#include <QStorageInfo> #include <QStorageInfo>
@@ -464,7 +465,7 @@ void ImportDialog::StartImporting() {
return; return;
} }
const auto& to_import = GetSelectedContentList(); auto to_import = GetSelectedContentList();
const std::size_t total_count = to_import.size(); const std::size_t total_count = to_import.size();
// Try to map total_size to int range // Try to map total_size to int range
@@ -476,19 +477,22 @@ void ImportDialog::StartImporting() {
label->setWordWrap(true); label->setWordWrap(true);
label->setFixedWidth(600); label->setFixedWidth(600);
auto* dialog = new QProgressDialog(tr("Initializing..."), tr("Cancel"), 0, auto* bar = new QProgressBar(this);
static_cast<int>(total_size / multiplier), this); bar->setRange(0, static_cast<int>(total_size / multiplier));
bar->setValue(0);
auto* dialog = new QProgressDialog(tr("Initializing..."), tr("Cancel"), 0, 0, this);
dialog->setBar(bar);
dialog->setLabel(label); dialog->setLabel(label);
dialog->setWindowModality(Qt::WindowModal); dialog->setWindowModality(Qt::WindowModal);
dialog->setMinimumDuration(0); dialog->setMinimumDuration(0);
dialog->setValue(0);
auto* job = new ImportJob(this, importer, std::move(to_import)); auto* job = new ImportJob(this, importer, std::move(to_import));
connect(job, &ImportJob::NextContent, this, connect(job, &ImportJob::NextContent, this,
[this, dialog, multiplier, total_count](u64 size_imported, u64 count, [this, bar, dialog, multiplier, total_count](
Core::ContentSpecifier next_content, int eta) { u64 size_imported, u64 count, Core::ContentSpecifier next_content, int eta) {
dialog->setValue(static_cast<int>(size_imported / multiplier)); bar->setValue(static_cast<int>(size_imported / multiplier));
dialog->setLabelText( dialog->setLabelText(
tr("<p>(%1/%2) Importing %3 (%4)...</p><p>&nbsp;</p><p align=\"right\">%5</p>") tr("<p>(%1/%2) Importing %3 (%4)...</p><p>&nbsp;</p><p align=\"right\">%5</p>")
.arg(count) .arg(count)
@@ -500,9 +504,9 @@ void ImportDialog::StartImporting() {
current_count = count; current_count = count;
}); });
connect(job, &ImportJob::ProgressUpdated, this, connect(job, &ImportJob::ProgressUpdated, this,
[this, dialog, multiplier, total_count](u64 total_size_imported, [this, bar, dialog, multiplier, total_count](u64 total_size_imported,
u64 current_size_imported, int eta) { u64 current_size_imported, int eta) {
dialog->setValue(static_cast<int>(total_size_imported / multiplier)); bar->setValue(static_cast<int>(total_size_imported / multiplier));
dialog->setLabelText(tr("<p>(%1/%2) Importing %3 (%4)...</p><p align=\"center\">%5 " dialog->setLabelText(tr("<p>(%1/%2) Importing %3 (%4)...</p><p align=\"center\">%5 "
"/ %6</p><p align=\"right\">%7</p>") "/ %6</p><p align=\"right\">%7</p>")
.arg(current_count) .arg(current_count)