From 8eb296802796743e3ea78ba5f1cdbeae278c66e6 Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 8 Mar 2020 00:24:53 +0300 Subject: [PATCH 1/2] Clear player data after stop --- src/components/playback/playbackmanager.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js index 3a3bddd98..8de1ffc19 100644 --- a/src/components/playback/playbackmanager.js +++ b/src/components/playback/playbackmanager.js @@ -3162,7 +3162,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla // User clicked stop or content ended var state = self.getPlayerState(player); - var streamInfo = getPlayerData(player).streamInfo; + var data = getPlayerData(player); + var streamInfo = data.streamInfo; var nextItem = self._playNextAfterEnded ? self._playQueueManager.getNextItemInfo() : null; @@ -3210,6 +3211,9 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem); } else if (nextItem) { self.nextTrack(); + } else { + // Nothing more to play - clear data + data.streamInfo = null; } } From 58dd6eb4918847783218b162ab3df285c68f373d Mon Sep 17 00:00:00 2001 From: Dmitry Lyzo Date: Sun, 22 Mar 2020 19:30:02 +0300 Subject: [PATCH 2/2] Add test for current item --- src/controllers/playback/videoosd.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js index 24d779f24..b6af14dd6 100644 --- a/src/controllers/playback/videoosd.js +++ b/src/controllers/playback/videoosd.js @@ -665,7 +665,8 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med } function onTimeUpdate(e) { - if (isEnabled) { + // Test for 'currentItem' is required for Firefox since its player spams 'timeupdate' events even being at breakpoint + if (isEnabled && currentItem) { var now = new Date().getTime(); if (!(now - lastUpdateTime < 700)) {