fix: Logout bug if registry keys are set

#56
timokoessler · Jan 7, 2025 · d7b1758 · d7b1758
1 parent 0101a25
commit d7b1758
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Guard.WPF/MainWindow.xaml.cs b/Guard.WPF/MainWindow.xaml.cs
@@ -29,6 +29,7 @@ public partial class MainWindow : FluentWindow
         private IntPtr windowInteropHandle;
         private readonly bool isAutostart;
         private string currentPageName = "";
+        public bool SkipApplyRegistrySettings = false;
 
         public MainWindow(bool autostart)
         {
@@ -186,8 +187,8 @@ private void NavLockClicked(object sender, RoutedEventArgs e)
 
         internal void Logout()
         {
+            SkipApplyRegistrySettings = true;
             Navigate(typeof(Welcome));
-            HideNavigation();
             Auth.Logout();
             TokenManager.ClearTokens();
             FullContentFrame.Visibility = Visibility.Visible;

diff --git a/Guard.WPF/Views/Pages/Start/Welcome.xaml.cs b/Guard.WPF/Views/Pages/Start/Welcome.xaml.cs
@@ -24,6 +24,11 @@ public Welcome()
 
         private void ApplyRegistrySettings()
         {
+            if(mainWindow.SkipApplyRegistrySettings)
+            {
+                mainWindow.SkipApplyRegistrySettings = false;
+                return;
+            }
             (bool hideSkip, bool hideWinHello, bool hidePassword) =
                 RegistrySettings.GetSetupHideOptions();