Fix bugs when setting wallpaper image to None

Author: t1m0thyj

src/ThemeDialog.cs

@@ -120,6 +120,10 @@ private void ApplySelectedTheme()
             if (displayComboBox.SelectedIndex == 0)
             {
                 activeThemes[0] = activeTheme;
+                if (selectedIndex == 0)
+                {
+                    activeThemes.RemoveRange(1, activeThemes.Count - 1);
+                }
             }
             else if (IsLockScreenSelected)
             {

src/UwpHelper.cs

@@ -72,38 +72,39 @@ public override async void OpenUpdateLink()
 
         public override async void SetWallpaper(string imagePath, int displayIndex)
         {
-            if (displayIndex != -1)
+            if (displayIndex != -1 || !imagePath.StartsWith(Environment.CurrentDirectory))
             {
                 WallpaperApi.SetWallpaper(imagePath, displayIndex);
             }
             else
             {
                 WallpaperApi.EnableTransitions();
                 var profileSettings = Windows.System.UserProfile.UserProfilePersonalizationSettings.Current;
-                await profileSettings.TrySetWallpaperImageAsync(await LoadImageFile(imagePath));
+                bool result = await profileSettings.TrySetWallpaperImageAsync(await LoadImageFile(imagePath));
+                if (!result)
+                {
+                    LoggingHandler.LogMessage("Failed to set wallpaper with UWP API: " + imagePath);
+                }
             }
         }
 
         public override async void SetLockScreen(string imagePath)
         {
             var profileSettings = Windows.System.UserProfile.UserProfilePersonalizationSettings.Current;
-            await profileSettings.TrySetLockScreenImageAsync(await LoadImageFile(imagePath));
+            bool result = await profileSettings.TrySetLockScreenImageAsync(await LoadImageFile(imagePath));
+            if (!result)
+            {
+                LoggingHandler.LogMessage("Failed to set lock screen image with UWP API: " + imagePath);
+            }
         }
 
         private static Task<Windows.Storage.StorageFile> LoadImageFile(string imagePath)
         {
-            if (imagePath.StartsWith(Environment.CurrentDirectory))
-            {
-                string[] pathSegments = imagePath.Split(Path.DirectorySeparatorChar);
-                var uri = new Uri("ms-appdata:///local/themes/" +
-                    Uri.EscapeDataString(pathSegments[pathSegments.Length - 2]) + "/" +
-                    Uri.EscapeDataString(pathSegments[pathSegments.Length - 1]));
-                return Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri).AsTask();
-            }
-            else
-            {
-                return Windows.Storage.StorageFile.GetFileFromPathAsync(imagePath).AsTask();
-            }
+            string[] pathSegments = imagePath.Split(Path.DirectorySeparatorChar);
+            var uri = new Uri("ms-appdata:///local/themes/" +
+                Uri.EscapeDataString(pathSegments[pathSegments.Length - 2]) + "/" +
+                Uri.EscapeDataString(pathSegments[pathSegments.Length - 1]));
+            return Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(uri).AsTask();
         }
     }
 }