From 6b4babb1b25b9ebd6084974c826c1602bf888367 Mon Sep 17 00:00:00 2001
From: Sean Edmunds <smedmunds226@gmail.com>
Date: Wed, 16 Apr 2025 01:11:40 -0500
Subject: [PATCH] Fixed ThemePlaylist bug

---
 src/hooks/useCommonHooks.ts                          |  4 ++--
 .../components/Theming/ThemePlaylistCard.tsx         | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/hooks/useCommonHooks.ts b/src/hooks/useCommonHooks.ts
index 9cf697d..4ce53dd 100644
--- a/src/hooks/useCommonHooks.ts
+++ b/src/hooks/useCommonHooks.ts
@@ -90,9 +90,9 @@ export function useCommonHooks() {
 
 	const handleThemeChange = (themes: Theme[], save: boolean) => {
 		const enabled = themes
-			.filter((t: Theme) => t.randomEnabled)
+			.filter((t: Theme) => t.randomEnabled === 1)
 			.filter((t: Theme) => t.name !== theme.name);
-		if (enabled.length === 0) {
+		if (enabled.length === 0 && currentThemePlaylist === 'All') {
 			setTheme(themes[0]);
 			save && setThemeName(themes[0].name);
 		} else if (currentThemePlaylist === 'All') {
diff --git a/src/pages/settings/components/Theming/ThemePlaylistCard.tsx b/src/pages/settings/components/Theming/ThemePlaylistCard.tsx
index 3c40559..1162462 100644
--- a/src/pages/settings/components/Theming/ThemePlaylistCard.tsx
+++ b/src/pages/settings/components/Theming/ThemePlaylistCard.tsx
@@ -252,11 +252,13 @@ function ThemePlaylistCard({
 							<ScrollArea h={'255px'} w={'100%'} style={{ zIndex: 2 }}>
 								<Stack gap={4}>
 									{themeList.length > 0 &&
-										themeList.map((item: number) => {
-											return (
-												<ThemeMiniCard key={item} item={item} allThemes={allThemes} />
-											);
-										})}
+										themeList
+											.sort((a: any, b: any) => (a > b ? 1 : -1))
+											.map((item: number) => {
+												return (
+													<ThemeMiniCard key={item} item={item} allThemes={allThemes} />
+												);
+											})}
 								</Stack>
 							</ScrollArea>
 						</>