Bug fixes

JamesCJ60 · Jun 15, 2023 · df01d8a · df01d8a
1 parent f1b17b6
commit df01d8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Universal x86 Tuning Utility Handheld/Views/Pages/AdvancedPage.xaml.cs b/Universal x86 Tuning Utility Handheld/Views/Pages/AdvancedPage.xaml.cs
@@ -249,7 +249,7 @@ private void UpdateGUI(UserIndex controllerNo)
                         }
                     }
 
-                    if (selected != lastSelected && cards[selected].Visibility != Visibility.Collapsed)
+                    if (selected != lastSelected && cards[selected].Visibility != Visibility.Collapsed && cards[selected].BorderBrush != selectedBorderBrush)
                     {
                         if (selected < 0) selected = 0;
                         if (selected > cards.Length - 1) selected = cards.Length - 1;
@@ -295,6 +295,8 @@ private void UpdateGUI(UserIndex controllerNo)
                         card.BorderBrush = normalBorderBrush;
                         card.BorderThickness = normalThickness;
                     }
+
+                    lastSelected = -1;
                 }
             } catch { }
         }        

diff --git a/Universal x86 Tuning Utility Handheld/Views/Pages/DashboardPage.xaml.cs b/Universal x86 Tuning Utility Handheld/Views/Pages/DashboardPage.xaml.cs
@@ -217,7 +217,7 @@ private void UpdateGUI(UserIndex controllerNo)
                         }
                     }
 
-                    if (selected != lastSelected && cards[selected].Visibility != Visibility.Collapsed)
+                    if (selected != lastSelected && cards[selected].Visibility != Visibility.Collapsed && cards[selected].BorderBrush != selectedBorderBrush)
                     {
                         if (selected < 0) selected = 0;
                         if (selected > cards.Length - 1) selected = cards.Length - 1;
@@ -263,6 +263,7 @@ private void UpdateGUI(UserIndex controllerNo)
                         card.BorderBrush = normalBorderBrush;
                         card.BorderThickness = normalThickness;
                     }
+                    lastSelected = -1;
                 }
             } catch { }
         }