thingz

JiayiLauncher/Appearance/PaletteGenerator.cs

@@ -21,6 +21,12 @@ private enum ColorChannel
 
 	public static void CreatePalette()
 	{
+		if (!JiayiSettings.Instance.UseBackgroundImage) return;
+
+		var extension = Path.GetExtension(JiayiSettings.Instance.BackgroundImageUrl);
+		if (string.IsNullOrEmpty(extension)) return;
+		if (extension is ".mp4" or ".webm" or ".mov") return;
+
 		var themeRoot = Path.Combine(ThemeState.RootPath, "themes", JiayiSettings.Instance.Theme);
 		var imagePath = Path.Combine(themeRoot, $"background{Path.GetExtension(JiayiSettings.Instance.BackgroundImageUrl)}");
 		using var bitmap = new Bitmap(imagePath);

JiayiLauncher/Settings/JiayiSettings.cs

@@ -187,13 +187,13 @@ public bool UseBackgroundImage
         Instance.Save();
     });
 
-    /* TODO: Remove this, as files will now be locally saved and uploaded to theme repo */
-    [Setting("Background image URL", "Appearance", "The URL of the image to use as the background. Videos are also supported.",
-        "UseBackgroundImage", "The URL should be a link to an image or video on the internet. A path to a local image will not work.")]
+    // [Setting("Background image URL", "Appearance", "The URL of the image to use as the background. Videos are also supported.",
+    //     "UseBackgroundImage", "The URL should be a link to an image or video on the internet. A path to a local image will not work.")]
     public string BackgroundImageUrl
     {
         get
         {
+            if (Instance == null) return string.Empty;
             if (Instance.UseBackgroundImage) 
                 return Regex.Match(_themeState.ThemeStyles.GetProperty(":root", "--background-image")?.Value ?? "", 
                     @"url\(\'(?<url>[^']+)\'\)").Groups["url"].Value;
@@ -202,8 +202,13 @@ public string BackgroundImageUrl
         }
         set
         {
+            // TODO: better fix for the launcher not loading backgrounds with the same extension
+            var needRefresh = Path.GetExtension(BackgroundImageUrl) == Path.GetExtension(value);
+
             value = value.Replace("\\", "/");
             _themeState.UpdateTheme("--background-image", $"url('{value}')");
+
+            if (needRefresh && MainLayout.Instance != null) MainLayout.Instance.Reload();
         }
     }