diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-12-26 03:17:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-12-26 03:17:45 +0300 |
| commit | 266271d65a5aaeb0040848a2e288695b3e9ed7c9 (patch) | |
| tree | 171f425d13e61ae9e0467c259b21628f5ba54404 /source/blender/editors/screen | |
| parent | fb4f78513e0cba6187646e950806f71cd42b7bae (diff) | |
- closing the user prefs accessed the temp screen after removing it.
- colorband drawing could use un-initialized vars (probably wouldnt crash)
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 6bf01a69d12..f0003669a12 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1124,13 +1124,14 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) /* mark it available for use for other windows */ screen->winid= 0; + /* before deleting the temp screen or we get invalid access */ + CTX_wm_window_set(C, prevwin); + /* if temp screen, delete it */ if(screen->full == SCREENTEMP) { Main *bmain= CTX_data_main(C); free_libblock(&bmain->screen, screen); } - - CTX_wm_window_set(C, prevwin); } /* *********************************** */ |