diff --git a/dashboard-ui/css/images/media/playcircle.png b/dashboard-ui/css/images/media/playcircle.png index 6d2ffd3413..007b1e512d 100644 Binary files a/dashboard-ui/css/images/media/playcircle.png and b/dashboard-ui/css/images/media/playcircle.png differ diff --git a/dashboard-ui/css/images/media/remove.png b/dashboard-ui/css/images/media/remove.png new file mode 100644 index 0000000000..b1cbfeed0c Binary files /dev/null and b/dashboard-ui/css/images/media/remove.png differ diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index eeb03221a4..7948abe1a4 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -19,6 +19,7 @@ var curentDurationTicks; var isStaticStream; var culturesPromise; + var isStopping; self.playlist = []; var currentPlaylistIndex = 0; @@ -76,6 +77,8 @@ function onPlaybackStopped() { + isStopping = true; + currentTimeElement.empty(); var endTime = this.currentTime; @@ -88,6 +91,8 @@ ApiClient.reportPlaybackStopped(Dashboard.getCurrentUserId(), currentItem.Id, position); + isStopping = false; + self.queuePlayNext(); } @@ -448,9 +453,6 @@ function playVideo(item, startPosition, user) { - //stop/kill videoJS - if (currentMediaElement) self.stop(); - // Account for screen rotation. Use the larger dimension as the width. var screenWidth = Math.max(screen.height, screen.width); @@ -808,7 +810,7 @@ self.playInternal = function (item, startPosition, user) { - if (self.isPlaying()) { + if (self.isPlaying() && !isStopping) { self.stop(); } diff --git a/dashboard-ui/scripts/playlist.js b/dashboard-ui/scripts/playlist.js index ec90a329e5..3a8485e704 100644 --- a/dashboard-ui/scripts/playlist.js +++ b/dashboard-ui/scripts/playlist.js @@ -21,12 +21,12 @@ var parentName = item.SeriesName || item.Album || item.ProductionYear || ''; html += '