From d56c24ce052831abfbc27e8e166294ac6be3a4a0 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 22 Apr 2023 18:13:42 +0200
Subject: [PATCH] 'CNetConBase::Recv' cleanup

---
 r5dev/engine/shared/base_rcon.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/r5dev/engine/shared/base_rcon.cpp b/r5dev/engine/shared/base_rcon.cpp
index 819ac43c..6cc21764 100644
--- a/r5dev/engine/shared/base_rcon.cpp
+++ b/r5dev/engine/shared/base_rcon.cpp
@@ -90,9 +90,9 @@ void CNetConBase::Recv(CConnectedNetConsoleData* pData, const int nMaxLen)
 		{
 			return;
 		}
-		if (nPendingLen <= 0) // EOF or error.
+		else if (nPendingLen == 0) // Socket was closed.
 		{
-			Disconnect("unexpected EOF or error");
+			Disconnect("remote closed socket");
 			return;
 		}
 	}//////////////////////////////////////////////
@@ -106,8 +106,6 @@ void CNetConBase::Recv(CConnectedNetConsoleData* pData, const int nMaxLen)
 		return;
 	}
 
-	bool bSuccess = true;
-
 	while (nReadLen > 0)
 	{
 		const int nRecvLen = ::recv(pData->m_hSocket, szRecvBuf, MIN(sizeof(szRecvBuf), nReadLen), MSG_NOSIGNAL);
@@ -123,10 +121,7 @@ void CNetConBase::Recv(CConnectedNetConsoleData* pData, const int nMaxLen)
 		}
 
 		nReadLen -= nRecvLen; // Process what we've got.
-		if (!ProcessBuffer(pData, szRecvBuf, nRecvLen, nMaxLen) && bSuccess)
-		{
-			bSuccess = false;
-		}
+		ProcessBuffer(pData, szRecvBuf, nRecvLen, nMaxLen);
 	}
 
 	return;