archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

progress dialog: Fix remaining time

Browse source
This commit is contained in:
Megamouse 2023-09-05 21:59:06 +02:00
parent 6beb421a35
commit 055c7db5a4
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rpcs3/Emu/system_progress.cpp
View file

@ -160,8 +160,8 @@ void progress_dialog_server::operator()()
u32 ftotal = 0; u32 ftotal = 0;
u32 fdone = 0; u32 fdone = 0;
u32 fknown_bits = 0; u64 fknown_bits = 0;
u32 ftotal_bits = 0; u64 ftotal_bits = 0;
u32 ptotal = 0; u32 ptotal = 0;
u32 pdone = 0; u32 pdone = 0;
const char* text1 = nullptr; const char* text1 = nullptr;
@ -236,9 +236,10 @@ void progress_dialog_server::operator()()
const u64 passed = (get_system_time() - start_time); const u64 passed = (get_system_time() - start_time);
const u64 seconds_passed = passed / 1'000'000; const u64 seconds_passed = passed / 1'000'000;
const u64 seconds_total = (passed / 1'000'000 * 100 / value); const u64 seconds_total = (passed / 1'000'000 * 100 / value);
const u64 seconds = seconds_total % 60; const u64 seconds_remaining = seconds_total - seconds_passed;
const u64 minutes = (seconds_total / 60) % 60; const u64 seconds = seconds_remaining % 60;
const u64 hours = (seconds_total / 3600); const u64 minutes = (seconds_remaining / 60) % 60;
const u64 hours = (seconds_remaining / 3600);
if (seconds_passed < 4) if (seconds_passed < 4)
{ {
@ -252,6 +253,10 @@ void progress_dialog_server::operator()()
{ {
fmt::append(progr, " (%um remaining)", minutes); fmt::append(progr, " (%um remaining)", minutes);
} }
else if (minutes == 0)
{
fmt::append(progr, " (%02us remaining)", seconds);
}
else else
{ {
fmt::append(progr, " (%um %02us remaining)", minutes, seconds); fmt::append(progr, " (%um %02us remaining)", minutes, seconds);