Initialize rcon only when setting rcon password

Author: xPaw

SourceQuery/SourceQuery.class.php

@@ -148,22 +148,6 @@ public function Connect( $Ip, $Port, $Timeout = 3, $Engine = self :: SOURCE )
 			}
 
 			$this->Connected = true;
-			
-			switch( $this->Socket->Engine )
-			{
-				case SourceQuery :: GOLDSOURCE:
-				{
-					$this->Rcon = new SourceQueryGoldSourceRcon( $this->Buffer, $this->Socket );
-					
-					break;
-				}
-				case SourceQuery :: SOURCE:
-				{
-					$this->Rcon = new SourceQuerySourceRcon( $this->Buffer, $this->Socket );
-					
-					break;
-				}
-			}
 		}
 
 		/**
@@ -197,6 +181,8 @@ public function Disconnect( )
 			if( $this->Rcon )
 			{
 				$this->Rcon->Close( );
+				
+				$this->Rcon = null;
 			}
 		}
 
@@ -537,6 +523,22 @@ public function SetRconPassword( $Password )
 				return false;
 			}
 
+			switch( $this->Socket->Engine )
+			{
+				case SourceQuery :: GOLDSOURCE:
+				{
+					$this->Rcon = new SourceQueryGoldSourceRcon( $this->Buffer, $this->Socket );
+					
+					break;
+				}
+				case SourceQuery :: SOURCE:
+				{
+					$this->Rcon = new SourceQuerySourceRcon( $this->Buffer, $this->Socket );
+					
+					break;
+				}
+			}
+			
 			$this->Rcon->Open( );
 
 			return $this->Rcon->Authorize( $Password );