Connection state flag fixes to ensure we actually recover when TryAnotherCM is returned

DepotDownloader/Steam3Session.cs

@@ -54,6 +54,7 @@ namespace DepotDownloader
         bool bExpectingDisconnectRemote;
         bool bDidDisconnect;
         bool bDidReceiveLoginKey;
+        bool bIsConnectionRecovery;
         int connectionBackoff;
         int seq; // more hack fixes
         DateTime connectTime;
@@ -444,15 +445,23 @@ namespace DepotDownloader
             return details;
         }
 
+        private void ResetConnectionFlags()
+        {
+            bExpectingDisconnectRemote = false;
+            bDidDisconnect = false;
+            bIsConnectionRecovery = false;
+            bDidReceiveLoginKey = false;
+        }
+        
         void Connect()
         {
             bAborted = false;
             bConnected = false;
             bConnecting = true;
             connectionBackoff = 0;
-            bExpectingDisconnectRemote = false;
+            
-            bDidDisconnect = false;
+            ResetConnectionFlags();
-            bDidReceiveLoginKey = false;
+            
             this.connectTime = DateTime.Now;
             this.steamClient.Connect();
         }
@@ -467,12 +476,13 @@ namespace DepotDownloader
             {
                 steamUser.LogOff();
             }
-
+            
-            steamClient.Disconnect();
+            bAborted = true;
             bConnected = false;
             bConnecting = false;
-            bAborted = true;
+            bIsConnectionRecovery = false;
-
+            steamClient.Disconnect();
+            
             // flush callbacks until our disconnected event
             while ( !bDidDisconnect )
             {
@@ -480,6 +490,12 @@ namespace DepotDownloader
             }
         }
 
+        private void Reconnect()
+        {
+            bIsConnectionRecovery = true;
+            steamClient.Disconnect();
+        }
+        
         public void TryWaitForLoginKey()
         {
             if ( logonDetails.Username == null || !credentials.LoggedOn || !ContentDownloader.Config.RememberPassword ) return;
@@ -532,8 +548,9 @@ namespace DepotDownloader
         private void DisconnectedCallback( SteamClient.DisconnectedCallback disconnected )
         {
             bDidDisconnect = true;
-
+            
-            if ( disconnected.UserInitiated || bExpectingDisconnectRemote )
+            // When recovering the connection, we want to reconnect even if the remote disconnects us
+            if ( !bIsConnectionRecovery && ( disconnected.UserInitiated || bExpectingDisconnectRemote ) )
             {
                 Console.WriteLine( "Disconnected from Steam" );
 
@@ -557,6 +574,9 @@ namespace DepotDownloader
                 }
 
                 Thread.Sleep( 1000 * ++connectionBackoff );
+
+                // Any connection related flags need to be reset here to match the state after Connect
+                ResetConnectionFlags();
                 steamClient.Connect();
             }
         }
@@ -615,10 +635,7 @@ namespace DepotDownloader
             {
                 Console.Write( "Retrying Steam3 connection (TryAnotherCM)..." );
                 
-                bExpectingDisconnectRemote = true;
+                Reconnect();
-                Abort( false );
-                
-                Connect();
 
                 return;
             }