tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race condition causing some people being unable to connect. (#19920)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2023-09-08 23:52:36 +02:00
committed by GitHub
parent f23e7024a6
commit e18f731b91
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Lobby/LobbyState.cs
View File

@@ -80,6 +80,10 @@ namespace Content.Client.Lobby
_gameTicker.InfoBlobUpdated += UpdateLobbyUi; _gameTicker.InfoBlobUpdated += UpdateLobbyUi;
_gameTicker.LobbyStatusUpdated += LobbyStatusUpdated; _gameTicker.LobbyStatusUpdated += LobbyStatusUpdated;
_gameTicker.LobbyLateJoinStatusUpdated += LobbyLateJoinStatusUpdated; _gameTicker.LobbyLateJoinStatusUpdated += LobbyLateJoinStatusUpdated;
_preferencesManager.OnServerDataLoaded += PreferencesDataLoaded;
_lobby.CharacterPreview.UpdateUI();
} }
protected override void Shutdown() protected override void Shutdown()
@@ -100,6 +104,13 @@ namespace Content.Client.Lobby
_characterSetup?.Dispose(); _characterSetup?.Dispose();
_characterSetup = null; _characterSetup = null;
_preferencesManager.OnServerDataLoaded -= PreferencesDataLoaded;
}
private void PreferencesDataLoaded()
{
_lobby?.CharacterPreview.UpdateUI();
} }
private void OnSetupPressed(BaseButton.ButtonEventArgs args) private void OnSetupPressed(BaseButton.ButtonEventArgs args)

3
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
View File

@@ -76,8 +76,6 @@ namespace Content.Client.Lobby.UI
AddChild(vBox); AddChild(vBox);
UpdateUI(); UpdateUI();
_preferencesManager.OnServerDataLoaded += UpdateUI;
} }
public Button CharacterSetupButton { get; } public Button CharacterSetupButton { get; }
@@ -85,7 +83,6 @@ namespace Content.Client.Lobby.UI
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
base.Dispose(disposing); base.Dispose(disposing);
_preferencesManager.OnServerDataLoaded -= UpdateUI;
if (!disposing) return; if (!disposing) return;
if (_previewDummy != null) _entityManager.DeleteEntity(_previewDummy.Value); if (_previewDummy != null) _entityManager.DeleteEntity(_previewDummy.Value);