Merge remote-tracking branch 'upstream/master' into focus-fixes

2020-08-30 18:19:08 +02:00
parent 9e4e8a911f 6045a026c7
commit ca4419da4d
26 changed files with 2146 additions and 1996 deletions
@@ -693,7 +693,7 @@ import 'css!assets/css/videoosd';
                    lastUpdateTime = now;
                    const player = this;
                    currentRuntimeTicks = playbackManager.duration(player);
-                    const currentTime = playbackManager.currentTime(player);
+                    const currentTime = playbackManager.currentTime(player) * 10000;
                    updateTimeDisplay(currentTime, currentRuntimeTicks, playbackManager.playbackStartTime(player), playbackManager.getBufferedRanges(player));
                    const item = currentItem;
                    refreshProgramInfoIfNeeded(player, item);