Skip to content

Commit

Permalink
Hide question box when hiding main menu (Fixes #1813, PR #3182)
Browse files Browse the repository at this point in the history
  • Loading branch information
XJMLN committed Sep 17, 2023
1 parent 03aef31 commit 4beff04
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Client/core/CMainMenu.cpp
Expand Up @@ -726,6 +726,7 @@ void CMainMenu::OnEscapePressedOffLine()
void CMainMenu::SetVisible(bool bVisible, bool bOverlay, bool bFrameDelay)
{
CMultiplayer* pMultiplayer = CCore::GetSingleton().GetMultiplayer();
CQuestionBox* pQuestionBox = CCore::GetSingleton().GetLocalGUI()->GetMainMenu()->GetQuestionWindow();
pMultiplayer->DisablePadHandler(bVisible);

if ((m_ucFade == FADE_VISIBLE || m_ucFade == FADE_IN) && bVisible == false)
Expand All @@ -747,6 +748,11 @@ void CMainMenu::SetVisible(bool bVisible, bool bOverlay, bool bFrameDelay)
m_Credits.SetVisible(false);
m_pNewsBrowser->SetVisible(false);

if (GetIsIngame() && pQuestionBox->IsVisible())
{
pQuestionBox->Reset();
pQuestionBox->Hide();
}
// m_bIsInSubWindow = false;
}
else
Expand Down

0 comments on commit 4beff04

Please sign in to comment.