Merge pull request #10577 from AudricV/fix-npe-play-queue-audio-track…

…-menu Fix crash when building the play queue audio track menu if the player is null
TeamNewPipe · Nov 16, 2023 · 3dc593f · 3dc593f
2 parents e8ed18f + 2cf7764
commit 3dc593f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -619,11 +619,13 @@ private void buildAudioTrackMenu() {
 
         final MenuItem audioTrackSelector = menu.findItem(R.id.action_audio_track);
         final List<AudioStream> availableStreams =
-                Optional.ofNullable(player.getCurrentMetadata())
+                Optional.ofNullable(player)
+                        .map(Player::getCurrentMetadata)
                         .flatMap(MediaItemTag::getMaybeAudioTrack)
                         .map(MediaItemTag.AudioTrack::getAudioStreams)
                         .orElse(null);
-        final Optional<AudioStream> selectedAudioStream = player.getSelectedAudioStream();
+        final Optional<AudioStream> selectedAudioStream = Optional.ofNullable(player)
+                .flatMap(Player::getSelectedAudioStream);
 
         if (availableStreams == null || availableStreams.size() < 2
                 || selectedAudioStream.isEmpty()) {