From d1e8b19cfa43b06105443b07fbf88000388eeb88 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Thu, 24 Oct 2024 11:52:34 +1300
Subject: [PATCH] Only use mini player if no fallback

---
 .../src/routes/(app)/watch/[slug]/+page.svelte       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
index 60de01bc..b001128f 100644
--- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
@@ -45,7 +45,7 @@
 	import ui from 'beercss';
 	import type { DataConnection } from 'peerjs';
 	import { type Segment } from 'sponsorblock-api';
-	import { onDestroy, onMount } from 'svelte';
+	import { onDestroy, onMount, tick } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import { get } from 'svelte/store';
 	import type { MediaTimeUpdateEvent } from 'vidstack';
@@ -252,7 +252,7 @@
 		}
 
 		if (player) {
-			player.addEventListener('end', () => {
+			player.addEventListener('end', async () => {
 				if (playlistVideos.length === 0) {
 					if ($playerAutoplayNextByDefaultStore) {
 						goto(`/watch/${data.video.recommendedVideos[0].videoId}`);
@@ -260,7 +260,7 @@
 					return;
 				}
 
-				goToCurrentPlaylistItem();
+				await goToCurrentPlaylistItem();
 
 				const playlistVideoIds = playlistVideos.map((value) => {
 					return value.videoId;
@@ -321,7 +321,8 @@
 			!$syncPartyPeerStore &&
 			!data.video.hlsUrl &&
 			data.video.formatStreams &&
-			data.video.formatStreams.length > 0
+			data.video.formatStreams.length > 0 &&
+			data.video.fallbackPatch === undefined
 		) {
 			miniPlayerSrcStore.set({
 				video: data.video,
@@ -352,7 +353,8 @@
 		}
 	}
 
-	function goToCurrentPlaylistItem() {
+	async function goToCurrentPlaylistItem() {
+		await tick();
 		const playlistCurrentVideo = document.getElementById(data.video.videoId);
 		const playlistScrollable = document.getElementById('playlist');