Merge pull request #10909 from Stypox/fix-getAudioTrackType-null

Fix not considering nullability when comparing getAudioTrackType
TeamNewPipe · Mar 28, 2024 · 81220f9 · 81220f9
2 parents e0268a9 + 3a014d8
commit 81220f9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java
@@ -874,6 +874,7 @@ private static Comparator<AudioStream> getAudioTrackNameComparator(
 
         return Comparator.comparing(AudioStream::getAudioLocale, Comparator.nullsLast(
                         Comparator.comparing(locale -> locale.getDisplayName(appLoc))))
-                .thenComparing(AudioStream::getAudioTrackType);
+                .thenComparing(AudioStream::getAudioTrackType, Comparator.nullsLast(
+                        Comparator.naturalOrder()));
     }
 }