VPS: never restore audio as disabled

This should finally solve the regression introduced in 3.6.2
akdevtech · Aug 21, 2024 · c4d7179 · c4d7179
1 parent b78b8cd
commit c4d7179
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Sources/Playback/Control/VLCPlaybackService.m b/Sources/Playback/Control/VLCPlaybackService.m
@@ -466,7 +466,16 @@ - (void)restoreAudioAndSubtitleTrack
         if (media.isNew)
             return;
 
-        [self selectAudioTrackAtIndex:media.audioTrackIndex];
+        SInt64 audioIndex = media.audioTrackIndex;
+        NSArray *audioTrackIndexes = _mediaPlayer.audioTrackIndexes;
+        if (audioIndex >= 0 && audioIndex < audioTrackIndexes.count) {
+            // we can cast this cause we won't have more than 2 million audiotracks
+            int actualAudioIndex = [audioTrackIndexes[audioIndex] intValue];
+            // never restore silence
+            if (actualAudioIndex != -1) {
+                _mediaPlayer.currentAudioTrackIndex = actualAudioIndex;
+            }
+        }
 
         if ([[NSUserDefaults standardUserDefaults] boolForKey:kVLCSettingDisableSubtitles]) {
             _mediaPlayer.currentVideoSubTitleIndex = -1;