diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-17 02:47:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-17 03:02:28 +0300 |
| commit | 2ced9326bbd5b9b776f333df44045db44deaef83 (patch) | |
| tree | 98b7d825cad3c6d70894837893c332819380e269 /source/blender/editors/screen | |
| parent | 1cfe2748f4fc7112f833e6ebdc4dfe7799b46c3a (diff) | |
Fix crash changing screen + region overlap fade
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index e981a5ec7c0..a69ad44d9f7 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); } |