Use member instead of static variables for confirm popup buttons

Otherwise this would cause issues when showing multiple confirm popups at the same time.
Robyt3 · Jul 15, 2023 · 104e74a · 104e74a
1 parent cfdc696
commit 104e74a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/game/client/ui.cpp b/src/game/client/ui.cpp
@@ -1463,15 +1463,13 @@ CUI::EPopupMenuFunctionResult CUI::PopupConfirm(void *pContext, CUIRect View, bo
 
  pUI->TextRender()->Text(Label.x, Label.y, SConfirmPopupContext::POPUP_FONT_SIZE, pConfirmPopup->m_aMessage, Label.w);
 
- static CButtonContainer s_CancelButton;
- if(pUI->DoButton_PopupMenu(&s_CancelButton, pConfirmPopup->m_aNegativeButtonLabel, &CancelButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC))
+ if(pUI->DoButton_PopupMenu(&pConfirmPopup->m_CancelButton, pConfirmPopup->m_aNegativeButtonLabel, &CancelButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC))
  {
  pConfirmPopup->m_Result = SConfirmPopupContext::CANCELED;
  return CUI::POPUP_CLOSE_CURRENT;
  }
 
- static CButtonContainer s_ConfirmButton;
- if(pUI->DoButton_PopupMenu(&s_ConfirmButton, pConfirmPopup->m_aPositiveButtonLabel, &ConfirmButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC) || (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)))
+ if(pUI->DoButton_PopupMenu(&pConfirmPopup->m_ConfirmButton, pConfirmPopup->m_aPositiveButtonLabel, &ConfirmButton, SConfirmPopupContext::POPUP_FONT_SIZE, TEXTALIGN_MC) || (Active && pUI->ConsumeHotkey(HOTKEY_ENTER)))
  {
  pConfirmPopup->m_Result = SConfirmPopupContext::CONFIRMED;
  return CUI::POPUP_CLOSE_CURRENT;

diff --git a/src/game/client/ui.h b/src/game/client/ui.h
@@ -557,6 +557,9 @@ class CUI
  char m_aMessage[1024];
  EConfirmationResult m_Result;
 
+ CButtonContainer m_CancelButton;
+ CButtonContainer m_ConfirmButton;
+
  SConfirmPopupContext();
  void Reset();
  void YesNoButtons();