- Extra guards around lobby join

Author: x64-dev

GenOnlineService/Controllers/Lobby/LobbyController.cs

@@ -698,6 +698,9 @@ public async Task<APIResult> Put(Int64 lobbyID)
 
 								if (playerSession != null)
 								{
+									// leave any lobby
+									LobbyManager.LeaveAnyLobby(user_id);
+
 									string strDisplayName = await Database.Functions.Auth.GetDisplayName(GlobalDatabaseInstance.g_Database, user_id);
 									bool bJoinedSuccessfully = await LobbyManager.JoinLobby(lobby, playerSession, strDisplayName, userPreferredPort, bHasMap);
 

GenOnlineService/LobbyManager.cs

@@ -477,6 +477,12 @@ public async Task Tick()
 		private readonly SemaphoreSlim g_SlotLock = new SemaphoreSlim(1, 1);
 		public async Task<bool> AddMember(UserSession playerSession, string strDisplayName, UInt16 userPreferredPort, bool bHasMap, UserLobbyPreferences lobbyPrefs)
 		{
+			LobbyMember? existingMember = GetMemberFromUserID(playerSession.m_UserID);
+			if (existingMember != null) // we're already in this lobby
+			{
+				return false;
+			}
+
 			// NOTE: AddMember is called async, so timing + slot determination could result in players being inserted in the same slot
 			await g_SlotLock.WaitAsync();
 			try