Added Cancellation to "Login Loop" (#207)

* Added Cancellation to "Login Loop" * Sonar angry
Foxlider · Oct 12, 2024 · cf1c353 · cf1c353
1 parent fd5eff7
commit cf1c353
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/FASTER/ViewModel/SteamUpdaterViewModel.cs b/FASTER/ViewModel/SteamUpdaterViewModel.cs
@@ -26,7 +26,7 @@
 
 namespace FASTER.ViewModel
 {
-    public sealed class SteamUpdaterViewModel : INotifyPropertyChanged
+    public sealed class SteamUpdaterViewModel : INotifyPropertyChanged, IDisposable
     {
         public SteamUpdaterViewModel()
         {
@@ -510,6 +510,8 @@ public async Task<int> RunModsUpdater(ObservableCollection<ArmaMod> mods)
 
         internal async Task<bool> SteamLogin()
         {
+            if (tokenSource.IsCancellationRequested)
+                tokenSource = new CancellationTokenSource();
             IsLoggingIn = true;
             var path = Path.Combine(Path.GetDirectoryName(ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath) ?? string.Empty, "sentries");
 
@@ -530,7 +532,7 @@ internal async Task<bool> SteamLogin()
                 Parameters.Output += $"\nConnecting to Steam as {(_steamCredentials.IsAnonymous ? "anonymous" : _steamCredentials.Username)}";
                 SteamClient.MaximumLogonAttempts = 5;
                 try
-                { await SteamClient.ConnectAsync(); }
+                { await SteamClient.ConnectAsync(tokenSource.Token); }
                 catch (SteamClientAlreadyRunningException)
                 { 
                     Parameters.Output += $"\nClient already logged in."; 
@@ -746,6 +748,11 @@ private void RaisePropertyChanged(string property)
             if (PropertyChanged == null) return;
             PropertyChanged(this, new PropertyChangedEventArgs(property));
         }
+
+        public void Dispose()
+        {
+            tokenSource.Dispose();
+        }
     }
 
     public static class UpdateState