From df81d5239829b11191004a6789dbe0c073dbf4d1 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sat, 22 Apr 2023 21:46:05 +0200
Subject: [PATCH] Improve assert

Fix assert condition where iSocket and GetAcceptedSocketCount are both 0.
---
 r5dev/engine/server/sv_rcon.cpp     | 2 +-
 r5dev/engine/shared/shared_rcon.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/r5dev/engine/server/sv_rcon.cpp b/r5dev/engine/server/sv_rcon.cpp
index 013b0075..080a2209 100644
--- a/r5dev/engine/server/sv_rcon.cpp
+++ b/r5dev/engine/server/sv_rcon.cpp
@@ -548,7 +548,7 @@ void CRConServer::Disconnect(const int nIndex, const char* szReason) // NETMGR
 			szReason = "unknown reason";
 		}
 
-		DevMsg(eDLL_T::SERVER, "Connection to '%s' closed (%s)\n", netAdr.ToString(), szReason);
+		DevMsg(eDLL_T::SERVER, "Connection to '%s' lost (%s)\n", netAdr.ToString(), szReason);
 		m_nAuthConnections--;
 	}
 
diff --git a/r5dev/engine/shared/shared_rcon.cpp b/r5dev/engine/shared/shared_rcon.cpp
index 65f89a9a..c2f7f3ce 100644
--- a/r5dev/engine/shared/shared_rcon.cpp
+++ b/r5dev/engine/shared/shared_rcon.cpp
@@ -92,7 +92,8 @@ bool CL_NetConConnect(CNetConBase* pBase, const char* pHostAdr, const int nHostP
 CConnectedNetConsoleData* SH_GetNetConData(CNetConBase* pBase, const int iSocket)
 {
 	const CSocketCreator* pCreator = pBase->GetSocketCreator();
-	Assert(iSocket >= 0 && iSocket < pCreator->GetAcceptedSocketCount());
+	Assert(iSocket >= 0 && (pCreator->GetAcceptedSocketCount() == 0
+		|| iSocket < pCreator->GetAcceptedSocketCount()));
 
 	if (!pCreator->GetAcceptedSocketCount())
 	{