From 64b4b7a2f2786e7fdfd2748519f7c57b0e650184 Mon Sep 17 00:00:00 2001 From: Marianne Gagnon Date: Mon, 24 Aug 2015 18:56:50 -0400 Subject: [PATCH] Don't try to navigate to another screen when a dialog is open, fixes #2265 --- src/online/online_player_profile.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp index 398b1a907..60eee5b72 100644 --- a/src/online/online_player_profile.cpp +++ b/src/online/online_player_profile.cpp @@ -173,10 +173,13 @@ namespace Online // Check if failure happened during automatic (saved) signin. else if (!isSuccess()) { - if (GUIEngine::getCurrentScreen() != MainMenuScreen::getInstance()) + if (GUIEngine::getCurrentScreen() != MainMenuScreen::getInstance() || + GUIEngine::ModalDialog::isADialogActive()) { // User has already opened another menu, so use message queue // to inform user that login failed. + // Same thing if a dialog is active, can't navigate to other + // screen when a dialog is active MessageQueue::add(MessageQueue::MT_ERROR, getInfo()); return; }