libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-01 15:55:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Fix access to deleted widget after rebuilding a dialog

Browse Source 
The issue was with the focus or mouse widget as it may not be a
direct child of the dialog (it may for example be a child of the tab
widget in the options dialog) and removing a widget was not
resetting the mouse of focus widget if that widget was not a
direct child.
This commit is contained in:
Thierry Crozat 2017-04-06 21:52:55 +01:00
parent 91125bcbcd
commit 78561ca94d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/dialog.cpp
View File

@ -361,11 +361,11 @@ Widget *Dialog::findWidget(const char *name) {
}
void Dialog::removeWidget(Widget *del) {
if (del == _mouseWidget)
if (del == _mouseWidget || del->containsWidget(_mouseWidget))
_mouseWidget = NULL;
if (del == _focusedWidget)
if (del == _focusedWidget || del->containsWidget(_focusedWidget))
_focusedWidget = NULL;
if (del == _dragWidget)
if (del == _dragWidget || del->containsWidget(_dragWidget))
_dragWidget = NULL;
GuiObject::removeWidget(del);