From 1a740c25417f735d6a778e2c6339356d48eed2ea Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 May 2022 15:15:35 +1000 Subject: Fix T98185: Assertion saving while fullscreen When saving from the menu the region was not set, causing the last region in `area->regionbase` to be used as the region was assigned before comparison. --- source/blender/windowmanager/intern/wm_event_system.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 92fa3754d3a..81ecfedf62c 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1965,12 +1965,9 @@ static void wm_handler_op_context_get_if_valid(bContext *C, region = NULL; } - if (region == NULL) { - LISTBASE_FOREACH (ARegion *, region_iter, &area->regionbase) { - region = region_iter; - if (region == handler->context.region) { - break; - } + if ((region == NULL) && handler->context.region) { + if (BLI_findindex(&area->regionbase, handler->context.region) != -1) { + region = handler->context.region; } } -- cgit v1.2.3