From 7b584ab4e1b3cf4768947bf51dff951cc1f7b2ed Mon Sep 17 00:00:00 2001 From: Taylor Richards Date: Sun, 10 Jul 2016 15:59:08 -0400 Subject: [PATCH] avoid popup-in-popup Int3() if chat disconnects during sign in --- src/network/multi_pxo.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/network/multi_pxo.cpp b/src/network/multi_pxo.cpp index 0488458..ffcce1f 100644 --- a/src/network/multi_pxo.cpp +++ b/src/network/multi_pxo.cpp @@ -2028,8 +2028,12 @@ void multi_pxo_handle_kick() // handle being disconnected void multi_pxo_handle_disconnect() { - popup(PF_USE_AFFIRMATIVE_ICON,1,POPUP_OK,XSTR("You have been disconnected from the server",942)); - gameseq_post_event(GS_EVENT_MAIN_MENU); + if ( popup_active() ) { + popup_change_text(XSTR("You have been disconnected from the server",942)); + } else { + popup(PF_USE_AFFIRMATIVE_ICON,1,POPUP_OK,XSTR("You have been disconnected from the server",942)); + gameseq_post_event(GS_EVENT_MAIN_MENU); + } } // return string2, which is the first substring of string 1 without a space -- 2.39.2