[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] src/dialogs: Fix render job duration when past midnight
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2017-03-04 17:24:46
Message-ID: E1ckDQE-0001CE-QW () code ! kde ! org
[Download RAW message or body]

Git commit 28816933a37a4799d8cade1b04c80bdde417911a by Jean-Baptiste Mardelle.
Committed on 04/03/2017 at 17:24.
Pushed by mardelle into branch 'Applications/16.12'.

Fix render job duration when past midnight
BUG: 372370

M  +5    -5    src/dialogs/renderwidget.cpp
M  +1    -1    src/dialogs/renderwidget.h

https://commits.kde.org/kdenlive/28816933a37a4799d8cade1b04c80bdde417911a

diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index f0794a180..84fd23727 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -2032,11 +2032,10 @@ void RenderWidget::setRenderJob(const QString &dest, int \
progress)  slotCheckJob();
     } else {
         QDateTime startTime = item->data(1, TimeRole).toDateTime();
-        int days = startTime.daysTo (QDateTime::currentDateTime()) ;
-        double elapsedTime = days * 86400 + startTime.addDays(days).secsTo( \
QDateTime::currentDateTime() ); +        qint64 elapsedTime = \
startTime.secsTo(QDateTime::currentDateTime());  quint32 remaining = elapsedTime * \
(100.0 - progress) / progress; +        int days = remaining / 86400;
         int remainingSecs = remaining % 86400;
-        days = remaining / 86400;
         QTime when = QTime ( 0, 0, 0, 0 ) ;
         when = when.addSecs (remainingSecs) ;
         QString est = (days > 0) ? i18np("%1 day ", "%1 days ", days) : QString();
@@ -2060,8 +2059,9 @@ void RenderWidget::setRenderStatus(const QString &dest, int \
status, const QStrin  // Job finished successfully
         item->setStatus(FINISHEDJOB);
         QDateTime startTime = item->data(1, TimeRole).toDateTime();
-        int days = startTime.daysTo(QDateTime::currentDateTime()) ;
-        int elapsedTime = startTime.addDays(days).secsTo( \
QDateTime::currentDateTime() ); +        qint64 elapsedTime = \
startTime.secsTo(QDateTime::currentDateTime()); +        int days = elapsedTime / \
86400; +        elapsedTime -= (days * 86400);
         QTime when = QTime ( 0, 0, 0, 0 ) ;
         when = when.addSecs (elapsedTime) ;
         QString est = (days > 0) ? i18np("%1 day ", "%1 days ", days) : QString();
diff --git a/src/dialogs/renderwidget.h b/src/dialogs/renderwidget.h
index 6bde70824..fd1d6922e 100644
--- a/src/dialogs/renderwidget.h
+++ b/src/dialogs/renderwidget.h
@@ -139,7 +139,7 @@ public:
         ProfileError = 1,
         ProxyWarning = 2
     };
-    
+
     /** @brief Display warning message in render widget. */
     void errorMessage(RenderError type, const QString &message);
 


[prev in list] [next in list] [prev in thread] [next in thread]