[vlc-commits] qt: Don't handle remaining time in Elapsed TimeLabel

Hugo Beauzée-Luyssen git at videolan.org
Mon Feb 12 13:01:57 CET 2018


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Feb 12 12:38:13 2018 +0100| [da46603300f0d68c8a312added17c8928571e1ab] | committer: Hugo Beauzée-Luyssen

qt: Don't handle remaining time in Elapsed TimeLabel

Fix #19677
Regression introduced by 8784800a751548149d74707aa0be78b316b43c2b

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=da46603300f0d68c8a312added17c8928571e1ab
---

 modules/gui/qt/components/interface_widgets.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index a640424ee9..9f67e30ebe 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -943,7 +943,8 @@ TimeLabel::TimeLabel( intf_thread_t *_p_intf, TimeLabel::Display _displayType  )
 
 void TimeLabel::setRemainingTime( bool remainingTime )
 {
-    b_remainingTime = remainingTime;
+    if (displayType != TimeLabel::Elapsed)
+        b_remainingTime = remainingTime;
 }
 
 void TimeLabel::setDisplayPosition( float pos, int64_t t, int length )



More information about the vlc-commits mailing list