Fix crash on playing next item in queue

jellyfin · Mar 26, 2022 · 9dd0831 · 9dd0831
1 parent cea0c45
commit 9dd0831
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/assets/js/plugins/NativeAudioPlayer.staticjs b/assets/js/plugins/NativeAudioPlayer.staticjs
@@ -65,10 +65,12 @@ class NativeAudioPlayer {
 			return;
 		}
 
-		// Playback has stopped
+		// Playback has finished and should be reported as stopped
 		if (status.isFinished) {
-			this._isPlaying = false;
-			this._safelyTriggerEvent('stopped');
+			if (this._isPlaying) {
+				this._isPlaying = false;
+				this._safelyTriggerEvent('stopped');
+			}
 			return;
 		}
 

diff --git a/components/NativeShellWebView.js b/components/NativeShellWebView.js
@@ -104,15 +104,11 @@ true;
 						}
 						break;
 					case 'ExpoAudioPlayer.play':
-						rootStore.mediaStore.type = MediaTypes.Audio;
-						rootStore.mediaStore.uri = data.url;
-						rootStore.mediaStore.backdropUri = data.backdropUrl;
-						rootStore.mediaStore.positionTicks = data.playerStartPositionTicks;
-						break;
 					case 'ExpoVideoPlayer.play':
-						rootStore.mediaStore.type = MediaTypes.Video;
+						rootStore.mediaStore.type = event === 'ExpoAudioPlayer.play' ? MediaTypes.Audio : MediaTypes.Video;
 						rootStore.mediaStore.uri = data.url;
 						rootStore.mediaStore.backdropUri = data.backdropUrl;
+						rootStore.mediaStore.isFinished = false;
 						rootStore.mediaStore.positionTicks = data.playerStartPositionTicks;
 						break;
 					case 'ExpoAudioPlayer.playPause':