From a0dbeba910ddab2499ea26282eb0b003427bc7ec Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sun, 22 Feb 2026 16:36:17 +1300
Subject: [PATCH] Fix default quality not showing in player settings

---
 .../src/lib/components/player/Player.svelte   |  5 ++-
 .../player/settings/Settings.svelte           | 43 ++++++++-----------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/materialious/src/lib/components/player/Player.svelte b/materialious/src/lib/components/player/Player.svelte
index 4c689e34..4285041e 100644
--- a/materialious/src/lib/components/player/Player.svelte
+++ b/materialious/src/lib/components/player/Player.svelte
@@ -55,7 +55,7 @@
 	import { addToast } from '$lib/components/Toast.svelte';
 	import { getPublicEnv, isMobile, isUnrestrictedPlatform, isYTBackend } from '$lib/misc';
 	import { isOwnBackend } from '$lib/shared';
-	import Settings from './settings/Settings.svelte';
+	import Settings, { setActiveAudioTrack, setActiveVideoTrack } from './settings/Settings.svelte';
 	import CaptionSettings from './settings/CaptionSettings.svelte';
 	import Airplay from './settings/Airplay.svelte';
 	import Pip from './settings/Pip.svelte';
@@ -244,6 +244,9 @@
 			restoreDefaultLanguage(player);
 			updateVideoPlayerHeight();
 
+			setActiveAudioTrack(player);
+			setActiveVideoTrack(player);
+
 			if ($playerCCByDefault) {
 				toggleSubtitles(player);
 			}
diff --git a/materialious/src/lib/components/player/settings/Settings.svelte b/materialious/src/lib/components/player/settings/Settings.svelte
index 994b7afe..17fb7d86 100644
--- a/materialious/src/lib/components/player/settings/Settings.svelte
+++ b/materialious/src/lib/components/player/settings/Settings.svelte
@@ -1,42 +1,33 @@
+<script lang="ts" module>
+	import type shaka from 'shaka-player/dist/shaka-player.ui';
+
+	let playerCurrentVideoTrack: shaka.extern.VideoTrack | undefined = $state(undefined);
+	let playerCurrentAudioTrack: shaka.extern.AudioTrack | undefined = $state(undefined);
+
+	export function setActiveVideoTrack(player: shaka.Player) {
+		const videoTracks = player.getVideoTracks();
+		playerCurrentVideoTrack = videoTracks.find((track) => track.active);
+	}
+
+	export function setActiveAudioTrack(player: shaka.Player) {
+		const audioTracks = player.getAudioTracks();
+		playerCurrentAudioTrack = audioTracks.find((track) => track.active);
+	}
+</script>
+
 <script lang="ts">
 	import { _ } from '$lib/i18n';
-	import type shaka from 'shaka-player/dist/shaka-player.ui';
 	import { SvelteSet } from 'svelte/reactivity';
 	import ISO6391 from 'iso-639-1';
 	import { playerAlwaysLoopStore } from '$lib/store';
 	import { playbackRates } from '$lib/player/index';
-	import { onMount } from 'svelte';
 
 	let { player, playerElement }: { player: shaka.Player; playerElement: HTMLMediaElement } =
 		$props();
 
 	let playerSettings: 'quality' | 'speed' | 'language' | 'caption' | 'root' = $state('root');
-	let playerCurrentVideoTrack: shaka.extern.VideoTrack | undefined = $state(undefined);
-	let playerCurrentAudioTrack: shaka.extern.AudioTrack | undefined = $state(undefined);
 	let playerLoop = $state($playerAlwaysLoopStore);
 
-	onMount(() => {
-		player.addEventListener('loaded', () => {
-			setActiveVideoTrack();
-			setActiveAudioTrack();
-		});
-
-		player.addEventListener('trackschanged', () => {
-			setActiveVideoTrack();
-			setActiveAudioTrack();
-		});
-	});
-
-	function setActiveVideoTrack() {
-		const videoTracks = player.getVideoTracks();
-		playerCurrentVideoTrack = videoTracks.find((track) => track.active);
-	}
-
-	function setActiveAudioTrack() {
-		const audioTracks = player.getAudioTracks();
-		playerCurrentAudioTrack = audioTracks.find((track) => track.active);
-	}
-
 	function filterUniqueAudioTracks(tracks: shaka.extern.AudioTrack[]): shaka.extern.AudioTrack[] {
 		const uniqueTracks: shaka.extern.AudioTrack[] = [];
 		const seen = new SvelteSet<string>();