diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h index 22d58807..284c6400 100644 --- a/Minecraft.Client/Common/Network/GameNetworkManager.h +++ b/Minecraft.Client/Common/Network/GameNetworkManager.h @@ -214,6 +214,7 @@ private: int GetJoiningReadyPercentage(); bool m_bLastDisconnectWasLostRoomOnly; bool m_bFullSessionMessageOnNextSessionChange; + bool m_bCancelRequested; #if defined __PS3__ || defined __PSVITA__ || defined __ORBIS__ bool m_bSignedOutofPSN; #endif diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp index 6a4ea096..55039d45 100644 --- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp +++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp @@ -287,7 +287,11 @@ void UIScene_FullscreenProgress::handleInput(int iPad, int key, bool repeat, boo case ACTION_MENU_CANCEL: if( pressed && m_cancelFunc != nullptr && !m_bWasCancelled ) { + m_cancelText = -1; + updateTooltips(); + m_bWasCancelled = true; + m_cancelFunc( m_cancelFuncParam ); } break;