diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-11 14:32:41 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-11 14:32:41 +0300 |
| commit | e738d0ec6c50dd4aa404b98f930c70cf30e70844 (patch) | |
| tree | ff555865b987178d62cc3daf8cf4a249ab9a3092 /source/blender/windowmanager | |
| parent | 1b8778e314910cea940f7850a4b86e0ffb45dd65 (diff) | |
| parent | e11aa3edddf54b451645b5f32775559b5af7ee1a (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 0941dd49d23..bea4faa779a 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -387,6 +387,18 @@ void wm_event_do_refresh_wm_and_depsgraph(bContext *C) CTX_wm_window_set(C, NULL); } +static void wm_event_execute_timers(bContext *C) +{ + wmWindowManager *wm = CTX_wm_manager(C); + + /* Set the first window as context, so that there is some minimal context. This avoids crashes + * when calling code that assumes that there is always a window in the context (which many + * operators do). */ + CTX_wm_window_set(C, wm->windows.first); + BLI_timer_execute(); + CTX_wm_window_set(C, NULL); +} + /* called in mainloop */ void wm_event_do_notifiers(bContext *C) { @@ -398,7 +410,7 @@ void wm_event_do_notifiers(bContext *C) return; } - BLI_timer_execute(); + wm_event_execute_timers(C); /* disable? - keep for now since its used for window level notifiers. */ #if 1 |