Fix issues with setting lock screen image

Author: t1m0thyj

src/ThemeDialog.cs

@@ -123,7 +123,7 @@ private void ApplySelectedTheme()
             }
             else if (IsLockScreenSelected)
             {
-                bool shouldContinue = ThemeDialogUtils.UpdateConfigForLockScreen();
+                bool shouldContinue = ThemeDialogUtils.UpdateConfigForLockScreen(activeTheme);
                 if (!shouldContinue)
                 {
                     return;

src/ThemeDialogUtils.cs

@@ -183,7 +183,7 @@ internal static void UpdateConfigForDisplay(List<string> activeThemes)
             }
         }
 
-        internal static bool UpdateConfigForLockScreen()
+        internal static bool UpdateConfigForLockScreen(string activeTheme)
         {
             if (JsonConfig.settings.lockScreenDisplayIndex != -1)
             {
@@ -195,6 +195,12 @@ internal static bool UpdateConfigForLockScreen()
                     return false;
                 }
             }
+            else if (JsonConfig.settings.lockScreenTheme == null && activeTheme != null)
+            {
+                MessageDialog.ShowInfo(_("WinDynamicDesktop cannot change the lock screen image when Windows " +
+                    "Spotlight is enabled. If the lock screen image does not update, navigate to \"Personalization " +
+                    "-> Lock screen\" in Windows settings and check that the lock screen is set to Picture mode."));
+            }
 
             JsonConfig.settings.lockScreenDisplayIndex = -1;
             LockScreenChanger.UpdateMenuItems();

src/UwpHelper.cs

@@ -92,11 +92,18 @@ public override async void SetLockScreen(string imagePath)
 
         private static Task<Windows.Storage.StorageFile> LoadImageFile(string imagePath)
         {
-            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();
+            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();
+            }
         }
     }
 }