Merge pull request #1053 from xPaw/userInitiated

Fix up userInitiated in various disconnect calls
SteamRE · Nov 18, 2021 · 0e42c79 · 0e42c79
2 parents e00e29b + dcef1b0
commit 0e42c79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SteamKit2/SteamKit2/Steam/CMClient.cs b/SteamKit2/SteamKit2/Steam/CMClient.cs
@@ -167,7 +167,7 @@ public void Connect( ServerRecord? cmServer = null )
         {
             lock ( connectionLock )
             {
-                this.Disconnect();
+                Disconnect( userInitiated: true );
                 Debug.Assert( connection == null );
 
                 Debug.Assert( connectionCancellation == null );
@@ -233,7 +233,7 @@ public void Connect( ServerRecord? cmServer = null )
         /// </summary>
         public void Disconnect() => Disconnect( userInitiated: true ); 
 
-        void Disconnect( bool userInitiated)
+        private protected void Disconnect( bool userInitiated )
         {
             lock ( connectionLock )
             {
@@ -339,7 +339,7 @@ protected virtual bool OnClientMsgReceived( [NotNullWhen(true)] IPacketMsg? pack
             if ( packetMsg == null )
             {
                 LogDebug( "CMClient", "Packet message failed to parse, shutting down connection" );
-                Disconnect();
+                Disconnect( userInitiated: false );
                 return false;
             }
 

diff --git a/SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs b/SteamKit2/SteamKit2/Steam/SteamClient/SteamClient.cs
@@ -383,13 +383,13 @@ protected override bool OnClientMsgReceived( IPacketMsg? packetMsg )
                 catch ( ProtoException ex )
                 {
                     LogDebug( nameof( SteamClient ), $"'{key.Name}' handler failed to (de)serialize a protobuf: {ex}" );
-                    Disconnect();
+                    Disconnect( userInitiated: false );
                     return false;
                 }
                 catch ( Exception ex )
                 {
                     LogDebug( nameof( SteamClient ), $"Unhandled exception from '{key.Name}' handler: {ex}" );
-                    Disconnect();
+                    Disconnect( userInitiated: false );
                     return false;
                 }
             }