diff --git a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift index ef2087425d..4dfef89b24 100644 --- a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift +++ b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift @@ -13,7 +13,13 @@ final class InstantPageDetailsItem: InstantPageItem { var frame: CGRect let wantsNode: Bool = true let separatesTiles: Bool = true - let medias: [InstantPageMedia] = [] + var medias: [InstantPageMedia] { + var result: [InstantPageMedia] = [] + for item in self.items { + result.append(contentsOf: item.medias) + } + return result + } let titleItems: [InstantPageItem] let titleHeight: CGFloat diff --git a/submodules/InstantPageUI/Sources/InstantPageMediaPlaylist.swift b/submodules/InstantPageUI/Sources/InstantPageMediaPlaylist.swift index 85175591cf..2a69e011ca 100644 --- a/submodules/InstantPageUI/Sources/InstantPageMediaPlaylist.swift +++ b/submodules/InstantPageUI/Sources/InstantPageMediaPlaylist.swift @@ -207,7 +207,11 @@ final class InstantPageMediaPlaylist: SharedMediaPlaylist { } self.updateState() } else { - self.currentItem = self.items[self.initialItemIndex] + if self.initialItemIndex < self.items.count { + self.currentItem = self.items[self.initialItemIndex] + } else { + self.currentItem = nil + } self.playedToEnd = false self.updateState() }