[Bf-blender-cvs] [2ced932] master: Fix crash changing screen + region overlap fade
Campbell Barton
noreply at git.blender.org
Tue Nov 17 01:10:18 CET 2015
Commit: 2ced9326bbd5b9b776f333df44045db44deaef83
Author: Campbell Barton
Date: Tue Nov 17 10:47:37 2015 +1100
Branches: master
https://developer.blender.org/rB2ced9326bbd5b9b776f333df44045db44deaef83
Fix crash changing screen + region overlap fade
===================================================================
M source/blender/editors/screen/screen_edit.c
===================================================================
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index e981a5e..a69ad44 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1272,16 +1272,20 @@ void ED_region_exit(bContext *C, ARegion *ar)
CTX_wm_region_set(C, ar);
WM_event_remove_handlers(C, &ar->handlers);
- if (ar->swinid)
+ if (ar->swinid) {
wm_subwindow_close(CTX_wm_window(C), ar->swinid);
- ar->swinid = 0;
+ ar->swinid = 0;
+ }
- if (ar->headerstr)
+ if (ar->headerstr) {
MEM_freeN(ar->headerstr);
- ar->headerstr = NULL;
+ ar->headerstr = NULL;
+ }
- if (ar->regiontimer)
+ if (ar->regiontimer) {
WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), ar->regiontimer);
+ ar->regiontimer = NULL;
+ }
CTX_wm_region_set(C, prevar);
}
More information about the Bf-blender-cvs
mailing list