dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-03 05:05:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fix batch progress bar value

Browse Source 
It was always one too early
This commit is contained in:
Megamouse 2026-05-20 18:51:06 +02:00
parent da599f7286
commit 190378bc33
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rpcs3/rpcs3qt/game_list_actions.cpp
View File

@ -1030,11 +1030,9 @@ void game_list_actions::BatchActionBySerials(progress_dialog* pdlg, const std::s
return false; return false;
} }
if (action(serial)) if (!action(serial))
{ {
const int done = index_ptr->load(); game_list_log.trace("Batch action for '%s' failed", serial);
pdlg->setLabelText(progressLabel.arg(done + 1).arg(serials_size));
pdlg->SetValue(done + 1);
} }
(*index_ptr)++; (*index_ptr)++;
@ -1052,11 +1050,21 @@ void game_list_actions::BatchActionBySerials(progress_dialog* pdlg, const std::s
indices.append(i); indices.append(i);
} }
QFutureWatcher<void>* future_watcher = new QFutureWatcher<void>(m_game_list_frame); QFutureWatcher<bool>* future_watcher = new QFutureWatcher<bool>(m_game_list_frame);
future_watcher->setFuture(QtConcurrent::map(std::move(indices), *iterate_over_serial)); future_watcher->setFuture(QtConcurrent::mapped(std::move(indices), *iterate_over_serial));
connect(future_watcher, &QFutureWatcher<void>::finished, m_game_list_frame, [=, this]() connect(future_watcher, &QFutureWatcher<bool>::resultReadyAt, m_game_list_frame, [=](int index)
{
if (future_watcher->resultAt(index))
{
const int done = pdlg->value() + 1;
pdlg->setLabelText(progressLabel.arg(done).arg(serials_size));
pdlg->SetValue(done);
}
});
connect(future_watcher, &QFutureWatcher<bool>::finished, m_game_list_frame, [=, this]()
{ {
pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size)); pdlg->setLabelText(progressLabel.arg(index->load()).arg(serials_size));
pdlg->setCancelButtonText(tr("OK")); pdlg->setCancelButtonText(tr("OK"));
@ -1092,6 +1100,10 @@ void game_list_actions::BatchActionBySerials(progress_dialog* pdlg, const std::s
if ((*iterate_over_serial)(*index)) if ((*iterate_over_serial)(*index))
{ {
const int done = index->load();
pdlg->setLabelText(progressLabel.arg(done).arg(serials_size));
pdlg->SetValue(done);
QTimer::singleShot(1, m_game_list_frame, *periodic_func); QTimer::singleShot(1, m_game_list_frame, *periodic_func);
return; return;
} }