From 9a8e9ce9a91e93a67f7d8e15c839bfadffce51e8 Mon Sep 17 00:00:00 2001 From: neil Date: Thu, 17 Apr 2014 14:51:06 +0000 Subject: [PATCH] Don't deactivate an object after it has already been cleaned up: doing so caused the String class's event handler to be removed twice. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@48932 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/libs/muimaster/classes/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workbench/libs/muimaster/classes/window.c b/workbench/libs/muimaster/classes/window.c index aa95b558ec..a4ced60dab 100644 --- a/workbench/libs/muimaster/classes/window.c +++ b/workbench/libs/muimaster/classes/window.c @@ -2590,10 +2590,10 @@ static void SetActiveObject(struct MUI_WindowData *data, Object *obj, { old_activenode = FindObjNode(&data->wd_CycleChain, data->wd_ActiveObject); - //if (_flags(data->wd_ActiveObject) & MADF_CANDRAW) - if (data->wd_Flags & MUIWF_OBJECTGOACTIVESENT) + if ((data->wd_Flags & MUIWF_OBJECTGOACTIVESENT) + && (_flags(data->wd_ActiveObject) & MADF_SETUP)) { - D(bug("Inactivate=%p\n", data->wd_ActiveObject)); + D(bug("Deactivate=%p\n", data->wd_ActiveObject)); DoMethod(data->wd_ActiveObject, MUIM_GoInactive); } } -- 2.11.4.GIT