From 4f97f16338266bdc48f39ee51d39b148e1eb811a Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Sat, 10 Oct 2026 12:59:01 +0200 Subject: [PATCH] Add additional null checks to PlaybackController.findBestDisplayMode --- .../jellyfin/androidtv/ui/playback/PlaybackController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java index d05a0a145..2907d8195 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java +++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java @@ -289,11 +289,11 @@ public class PlaybackController implements PlaybackControllerNotifiable { } } - private Display.Mode findBestDisplayMode(MediaStream videoStream) { - if (mFragment == null || mDisplayModes == null || videoStream.getRealFrameRate() == null) + @Nullable + private Display.Mode findBestDisplayMode(@Nullable MediaStream videoStream) { + if (mFragment == null || mDisplayModes == null || videoStream == null || videoStream.getRealFrameRate() == null || videoStream.getWidth() == null || videoStream.getHeight() == null) return null; - int curWeight = 0; Display.Mode bestMode = null; int sourceRate = Math.round(videoStream.getRealFrameRate() * 100);