diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-12-11 15:24:23 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-11 15:24:23 +0300 |
| commit | f03735552bec066fc14696a879e441eb29bba7c1 (patch) | |
| tree | d502c9b535ca27cb7bbcc92c1cb00022fe0dfec3 /source/blender/windowmanager/intern/wm_window.c | |
| parent | 3256d0fc6a2522532bdfd6ada2dd3dd1698094c8 (diff) | |
Fix for [#22967] UI stops updating
* Close event probably happens when drawable is set to other window and this messes up drawing.
* Also fixes #25071 and possibly #22477 (somebody with osx has to re-test)
Diffstat (limited to 'source/blender/windowmanager/intern/wm_window.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 7ad7be54e96..438f34f06cf 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -148,10 +148,9 @@ void wm_window_free(bContext *C, wmWindowManager *wm, wmWindow *win) CTX_wm_window_set(C, NULL); } - if(wm->windrawable==win) - wm->windrawable= NULL; - if(wm->winactive==win) - wm->winactive= NULL; + /* always set drawable and active to NULL, prevents non-drawable state of main windows (bugs #22967 and #25071, possibly #22477 too) */ + wm->windrawable= NULL; + wm->winactive= NULL; /* end running jobs, a job end also removes its timer */ for(wt= wm->timers.first; wt; wt= wtnext) { |