ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a crash after closing screen keyboard when dialog window is active.

Browse Source 
Also fixed using screen keyboard with gamepad when it's used in dialog window.
This commit is contained in:
Deve 2019-01-31 22:00:39 +01:00
parent a05889fa6a
commit 575f44a043
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/guiengine/event_handler.cpp
View File

@ -404,16 +404,22 @@ void EventHandler::sendNavigationEvent(const NavigationDirection nav, const int
{
Widget* w = GUIEngine::getFocusForPlayer(playerID);
if (ScreenKeyboard::isActive() &&
!ScreenKeyboard::getCurrent()->isMyIrrChild(w->getIrrlichtElement()))
if (w != NULL)
{
w = NULL;
}
if (ModalDialog::isADialogActive() &&
!ModalDialog::getCurrent()->isMyIrrChild(w->getIrrlichtElement()))
{
w = NULL;
if (ScreenKeyboard::isActive())
{
if (!ScreenKeyboard::getCurrent()->isMyIrrChild(w->getIrrlichtElement()))
{
w = NULL;
}
}
else if (ModalDialog::isADialogActive())
{
if (!ModalDialog::getCurrent()->isMyIrrChild(w->getIrrlichtElement()))
{
w = NULL;
}
}
}
if (w == NULL)