From 1d88bca3d567ea05bb39b442991db2c45557e2dd Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Sat, 30 Dec 2023 22:40:08 +0100
Subject: [PATCH] Improve null-safety

---
 .../src/main/java/ctbrec/sites/cherrytv/CherryTvModel.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/ctbrec/sites/cherrytv/CherryTvModel.java b/common/src/main/java/ctbrec/sites/cherrytv/CherryTvModel.java
index ee358e6e..5bda0f93 100644
--- a/common/src/main/java/ctbrec/sites/cherrytv/CherryTvModel.java
+++ b/common/src/main/java/ctbrec/sites/cherrytv/CherryTvModel.java
@@ -4,6 +4,7 @@ import com.iheartradio.m3u8.*;
 import com.iheartradio.m3u8.data.MasterPlaylist;
 import com.iheartradio.m3u8.data.Playlist;
 import com.iheartradio.m3u8.data.PlaylistData;
+import com.iheartradio.m3u8.data.StreamInfo;
 import ctbrec.*;
 import ctbrec.io.HttpException;
 import ctbrec.recorder.download.StreamSource;
@@ -118,8 +119,8 @@ public class CherryTvModel extends AbstractModel {
                 if (playlist.hasStreamInfo()) {
                     StreamSource src = new StreamSource();
                     src.setBandwidth(playlist.getStreamInfo().getBandwidth());
-                    src.setHeight(playlist.getStreamInfo().getResolution().height);
-                    src.setWidth(playlist.getStreamInfo().getResolution().width);
+                    src.setHeight(Optional.ofNullable(playlist.getStreamInfo()).map(StreamInfo::getResolution).map(res -> res.height).orElse(0));
+                    src.setWidth(Optional.ofNullable(playlist.getStreamInfo()).map(StreamInfo::getResolution).map(res -> res.width).orElse(0));
                     String masterUrl = masterPlaylistUrl;
                     String baseUrl = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1);
                     String segmentUri = baseUrl + playlist.getUri();