make suggestNextVideo().getSimpleInstance() nullsafe in PlayerMarshal…

…lerService.groovy
streamaserver · Sep 28, 2018 · c5f3deb · c5f3deb
1 parent 397d81f
commit c5f3deb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/grails-app/services/streama/marshallers/PlayerMarshallerService.groovy b/grails-app/services/streama/marshallers/PlayerMarshallerService.groovy
@@ -52,9 +52,9 @@ class PlayerMarshallerService {
 
           Video nextEpisode = video.getNextEpisode()
           if (nextEpisode && nextEpisode.files) {
-            returnArray['nextEpisode'] = nextEpisode.getSimpleInstance()
+            returnArray['nextEpisode'] = nextEpisode?.getSimpleInstance()
           }else{
-            returnArray['nextVideo'] = video.suggestNextVideo().getSimpleInstance()
+            returnArray['nextVideo'] = video.suggestNextVideo()?.getSimpleInstance()
           }
         }
         if (video instanceof Movie) {
@@ -64,7 +64,7 @@ class PlayerMarshallerService {
           returnArray['backdrop_path'] = video.buildImagePath('backdrop_path', 1280)
           returnArray['poster_path'] = video.poster_path
           returnArray['trailerKey'] = video.trailerKey
-          returnArray['nextVideo'] = video.suggestNextVideo().getSimpleInstance()
+          returnArray['nextVideo'] = video.suggestNextVideo()?.getSimpleInstance()
 
         }
         if (video instanceof GenericVideo) {