fix export job progress may flicker w/ "--:--:--"

mltframework · Jan 2, 2025 · 6115164 · 6115164
1 parent 4e68cb5
commit 6115164
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/jobqueue.cpp b/src/jobqueue.cpp
@@ -89,7 +89,9 @@ void JobQueue::onProgressUpdated(QStandardItem *standardItem, int percent)
                 remaining = tr("paused");
             } else if (percent > 0) {
                 auto time = job->estimateRemaining(percent);
-                if (percent > 2 && QTime(0, 0).secsTo(time) > 0)
+                if (QTime(0, 0).secsTo(time) == 0)
+                    return;
+                if (percent > 2)
                     remaining = time.toString();
                 remaining = QStringLiteral("%1% (%2)").arg(percent).arg(remaining);
             }

diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp
@@ -201,7 +201,7 @@ void MeltJob::onReadyRead()
         index = msg.indexOf("percentage:");
         if (index > -1) {
             int percent = msg.mid(index + 11).toInt();
-            if (percent != m_previousPercent) {
+            if (percent > 0 && percent != m_previousPercent) {
                 emit progressUpdated(m_item, percent);
                 QCoreApplication::processEvents();
                 m_previousPercent = percent;