From 132a21a0bd7cd6a2b60ff27fd9bf4f8f5168ebc0 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Wed, 28 Sep 2022 16:19:36 -0400 Subject: [PATCH 1/2] preventing unblocking of UI during periodic lobby query --- Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs b/Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs index e5a56180f..fc19d6f5d 100644 --- a/Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs +++ b/Assets/Scripts/Gameplay/UI/Lobby/LobbyUIMediator.cs @@ -119,14 +119,18 @@ public async void QueryLobbiesRequest(bool blockUI) bool playerIsAuthorized = await m_AuthenticationServiceFacade.EnsurePlayerIsAuthorized(); - if (!playerIsAuthorized) + if (blockUI && !playerIsAuthorized) { UnblockUIAfterLoadingIsComplete(); return; } await m_LobbyServiceFacade.RetrieveAndPublishLobbyListAsync(); - UnblockUIAfterLoadingIsComplete(); + + if (blockUI) + { + UnblockUIAfterLoadingIsComplete(); + } } public async void JoinLobbyWithCodeRequest(string lobbyCode) From e17b57eb3c47fb8ac29e9d43e6b8c25244ccd6e0 Mon Sep 17 00:00:00 2001 From: LPLafontaineB Date: Wed, 28 Sep 2022 16:28:30 -0400 Subject: [PATCH 2/2] Adding changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fef3942c9..60a607bdd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * Better instructions for host listen IP. (#738) Most useful cases are usually 127.0.0.1 and 0.0.0.0. * Tank's shield charge animation not getting stuck due to multiple invocations. (#742) * Lobby join button not interactable if no join code is provided. (#744) This prevents an ArgumentNullException happening when we try to join a Lobby with an empty join code. +* Lobby UI unblocking before it should. (#748) This makes sure that we are not unblocking the UI while we are in the middle of the connection process, to prevent users from starting a second one at the same time. Now the UI stays blocked until the connection either succeeds of fails. ## [v1.3.0-pre] - 2022-06-23