aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
diff options
context:
space:
mode:
authorSylvessa <225480449+sylvessa@users.noreply.github.com>2026-03-26 09:15:11 -0500
committerGitHub <noreply@github.com>2026-03-26 10:15:11 -0400
commit1a50770647c582c5ce194e5741e3014bb1c1e8b2 (patch)
tree8160994034f5f58b222032b73f8cda8c42e92479 /Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
parentdee559bd16e5fc4fb1d8cdd16e7e3924666b01c9 (diff)
Add asynchronous server joining (#1408)
Diffstat (limited to 'Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp')
-rw-r--r--Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp18
1 files changed, 18 insertions, 0 deletions
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
index 417c1700..5b83ea7c 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
@@ -583,6 +583,24 @@ void UIScene_JoinMenu::JoinGame(UIScene_JoinMenu* pClass)
// Alert the app the we no longer want to be informed of ethernet connections
app.SetLiveLinkRequired( false );
+#ifdef _WINDOWS64
+ if (result == CGameNetworkManager::JOINGAME_PENDING)
+ {
+ pClass->m_bIgnoreInput = false;
+
+ ConnectionProgressParams *param = new ConnectionProgressParams();
+ param->iPad = ProfileManager.GetPrimaryPad();
+ param->stringId = -1;
+ param->showTooltips = true;
+ param->setFailTimer = false;
+ param->timerTime = 0;
+ param->cancelFunc = nullptr;
+ param->cancelFuncParam = nullptr;
+ ui.NavigateToScene(ProfileManager.GetPrimaryPad(), eUIScene_ConnectingProgress, param);
+ return;
+ }
+#endif
+
if( result != CGameNetworkManager::JOINGAME_SUCCESS )
{
int exitReasonStringId = -1;