Execute change Foreground on UI thread

C1rdec · Dec 14, 2024 · 2ae38eb · 2ae38eb
1 parent 7f16351
commit 2ae38eb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/src/PoeLurker.Core/KeyboardLurker.cs b/src/PoeLurker.Core/KeyboardLurker.cs
@@ -343,6 +343,10 @@ private async void SearchItem(KeyboardMessageEventArgs e)
     private async void OpenPoeTrade(KeyboardMessageEventArgs e)
     {
         var itemText = await GetClipboardTextAsync();
+        if (string.IsNullOrEmpty(itemText))
+        {
+            return;
+        }
 
         PoeTradeService.Open(itemText);
     }

diff --git a/src/PoeLurker.UI/ViewModels/PoeOverlayBase.cs b/src/PoeLurker.UI/ViewModels/PoeOverlayBase.cs
@@ -233,14 +233,17 @@ private static double Scale(double value, double scale, bool absolute)
     /// <param name="e">if set to <c>true</c> [e].</param>
     private void DockingHelper_OnForegroundChange(object sender, bool inForegound)
     {
-        if (inForegound)
-        {
-            ShowView();
-        }
-        else
+        Execute.OnUIThread(() =>
         {
-            HideView();
-        }
+            if (inForegound)
+            {
+                ShowView();
+            }
+            else
+            {
+                HideView();
+            }
+        });
     }
 
     /// <summary>

diff --git a/src/PoeLurker.UI/ViewModels/ShellViewModel.cs b/src/PoeLurker.UI/ViewModels/ShellViewModel.cs
@@ -436,7 +436,7 @@ private async void SettingsService_OnSave(object sender, EventArgs e)
         }
         else
         {
-            await DeactivateItemAsync(_incomingTradeBarOverlay, true, CancellationToken.None);
+            await Execute.OnUIThreadAsync(() => DeactivateItemAsync(_incomingTradeBarOverlay, true, CancellationToken.None));
         }
 
         if (_settingsService.OutgoingTradeEnabled)
@@ -818,7 +818,7 @@ private void ShowMap(Map item)
     {
         if (!_popup.IsActive)
         {
-            ActivateItemAsync(_popup);
+            Execute.OnUIThreadAsync(() => ActivateItemAsync(_popup));
         }
 
         if (_settingsService.MapEnabled)
@@ -841,7 +841,7 @@ private void ShowItemDetails(object sender, PoeItem item)
     {
         if (!_popup.IsActive)
         {
-            ActivateItemAsync(_popup);
+            Execute.OnUIThreadAsync(() => ActivateItemAsync(_popup));
         }
 
         if (item is Map || item.Rarity == Rarity.Currency || item.Rarity == Rarity.Unique)
@@ -869,7 +869,7 @@ public Task HandleAsync(Screen screen, CancellationToken token)
             return Task.CompletedTask;
         }
 
-        return ActivateItemAsync(screen);
+        return Execute.OnUIThreadAsync(() => ActivateItemAsync(screen));
     }
 
     /// <summary>
@@ -880,11 +880,11 @@ public Task HandleAsync(SkillTimelineMessage message, CancellationToken token)
     {
         if (message.IsVisible)
         {
-            return ActivateItemAsync(_skillTimelineOverlay);
+            return Execute.OnUIThreadAsync(() => ActivateItemAsync(_skillTimelineOverlay));
         }
         else
         {
-            return DeactivateItemAsync(_skillTimelineOverlay, true, CancellationToken.None);
+            return Execute.OnUIThreadAsync(() => DeactivateItemAsync(_skillTimelineOverlay, true, CancellationToken.None));
         }
     }
 

diff --git a/src/PoeLurker.UI/ViewModels/TradebarViewModel.cs b/src/PoeLurker.UI/ViewModels/TradebarViewModel.cs
@@ -631,7 +631,7 @@ protected override Task OnDeactivateAsync(bool close, CancellationToken token)
             _clientLurker.TradeAccepted -= Lurker_TradeAccepted;
             _clientLurker.PlayerJoined -= Lurker_PlayerJoined;
             _clientLurker.PlayerLeft -= Lurker_PlayerLeft;
-            TradeOffers.Clear();
+            Execute.OnUIThread(() => TradeOffers.Clear());
         }
 
         return base.OnDeactivateAsync(close, token);