From b2ab049253f1e326f60ba1a00bf80c6f05d485e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Collet?= <jeremie.collet@orange.com>
Date: Thu, 18 Jun 2020 15:54:40 +0200
Subject: [PATCH] Fix some problems when there are no thumbnails in stream
 (#3302)

---
 contrib/akamai/controlbar/ControlBar.js | 2 +-
 src/streaming/MediaPlayer.js            | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/akamai/controlbar/ControlBar.js b/contrib/akamai/controlbar/ControlBar.js
index e80fc1001d..acec19c92c 100644
--- a/contrib/akamai/controlbar/ControlBar.js
+++ b/contrib/akamai/controlbar/ControlBar.js
@@ -579,7 +579,7 @@ var ControlBar = function (dashjsMediaPlayer, displayUTCTimeCodes) {
                     el = createMenuContent(el, getMenuContent(menuType, info.audio, contentFunc), 'audio', 'audio-' + menuType + '-list');
                     setMenuItemsState(getMenuInitialIndex(info.audio, menuType, 'audio'), 'audio-' + menuType + '-list');
                 }
-                if (info.images.length > 1) {
+                if (info.images && info.images.length > 1) {
                     el.appendChild(createMediaTypeMenu('image'));
                     el = createMenuContent(el, getMenuContent(menuType, info.images, contentFunc, false), 'image', 'image-' + menuType + '-list');
                     setMenuItemsState(getMenuInitialIndex(info.images, menuType, 'image'), 'image-' + menuType + '-list');
diff --git a/src/streaming/MediaPlayer.js b/src/streaming/MediaPlayer.js
index 6f72125918..db7e526469 100644
--- a/src/streaming/MediaPlayer.js
+++ b/src/streaming/MediaPlayer.js
@@ -1665,16 +1665,19 @@ function MediaPlayer() {
         }
         if (time < 0) {
             callback(null);
+            return;
         }
         const s = playbackController.getIsDynamic() ? getDVRSeekOffset(time) : time;
         const stream = streamController.getStreamForTime(s);
         if (stream === null) {
             callback(null);
+            return;
         }
 
         const thumbnailController = stream.getThumbnailController();
         if (!thumbnailController) {
             callback(null);
+            return;
         }
 
         const timeInPeriod = streamController.getTimeRelativeToStreamId(s, stream.getId());