Update location at launch and on refresh

t1m0thyj · Apr 27, 2024 · 58ec388 · 58ec388
1 parent 6a50bef
commit 58ec388
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/AppContext.cs b/src/AppContext.cs
@@ -31,7 +31,7 @@ public AppContext(string[] args) : base(new HiddenForm())
             ThemeManager.Initialize();
             ScriptManager.Initialize();
 
-            scheduler.Run();
+            scheduler.RunAndUpdateLocation();
             LaunchSequence.NextStep();
             UpdateChecker.Initialize();
         }

diff --git a/src/EventScheduler.cs b/src/EventScheduler.cs
@@ -51,11 +51,11 @@ public EventScheduler()
             SystemEvents.TimeChanged += OnTimeChanged;
         }
 
-        public void Run(bool forceImageUpdate = false, DisplayEvent overrideEvent = null)
+        public bool Run(bool forceImageUpdate = false, DisplayEvent overrideEvent = null)
         {
             if (!LaunchSequence.IsLocationReady() || !LaunchSequence.IsThemeReady())
             {
-                return;
+                return false;
             }
             else if (displayEvents == null || forceImageUpdate)
             {
@@ -129,6 +129,17 @@ public void Run(bool forceImageUpdate = false, DisplayEvent overrideEvent = null
             }
 
             StartTimer(nextUpdateTime.Value);
+            return true;
+        }
+
+        public async void RunAndUpdateLocation(bool forceImageUpdate = false)
+        {
+            bool result = Run(forceImageUpdate);
+
+            if (result && JsonConfig.settings.locationMode == 1 && await UwpLocation.UpdateGeoposition())
+            {
+                Run();  // Update wallpaper again if location has changed
+            }
         }
 
         private bool UpdateDisplayList()
@@ -217,12 +228,15 @@ private void HandleTimerEvent(bool updateLocation)
                 return;
             }
 
-            if (updateLocation && JsonConfig.settings.locationMode == 1)
+            if (updateLocation)
+            {
+                RunAndUpdateLocation();
+            }
+            else
             {
-                Task.Run(UwpLocation.UpdateGeoposition);
+                Run();
             }
 
-            Run();
             UpdateChecker.TryCheckAuto();
         }
 

diff --git a/src/TrayMenu.cs b/src/TrayMenu.cs
@@ -137,7 +137,7 @@ private void OnLanguageItemClick(object sender, EventArgs e)
 
         private void OnRefreshItemClick(object sender, EventArgs e)
         {
-            AppContext.scheduler.Run(true);
+            AppContext.scheduler.RunAndUpdateLocation(true);
         }
 
         private void OnFullScreenItemClick(object sender, EventArgs e)