diff options
| author | Harley Acheson <harley.acheson@gmail.com> | 2022-04-28 01:07:34 +0300 |
|---|---|---|
| committer | Harley Acheson <harley.acheson@gmail.com> | 2022-04-28 01:07:34 +0300 |
| commit | c6ce2be4962de62415fadd8f4f38e5a9e12b5f64 (patch) | |
| tree | 1307151f9a2c73841683456983bd86f3d54412d3 /source/blender | |
| parent | b60f3fe6ada2904c93383d8f5160b750423725ea (diff) | |
Fix T97627: Revert Window Redraw When Saving
Removal of the `WM_redraw_windows` call in `wm_file_write` introduced
in rB7a9cfd08a8d7415ff004809cf62570be9152273e as that can cause
crashing while saving from a script.
See D14780 for more details.
Differential Revision: https://developer.blender.org/D14780
Reviewed by Campbell Barton
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index caa3a493349..bee7e71df54 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1760,11 +1760,9 @@ static bool wm_file_write(bContext *C, /* Enforce full override check/generation on file save. */ BKE_lib_override_library_main_operations_create(bmain, true); - if (!G.background && BLI_thread_is_main()) { - /* Redraw to remove menus that might be open. - * But only in the main thread otherwise this can crash, see T92704. */ - WM_redraw_windows(C); - } + /* NOTE: Ideally we would call `WM_redraw_windows` here to remove any open menus. But we + * can crash if saving from a script, see T92704 & T97627. Just checking `!G.background + * && BLI_thread_is_main()` is not sufficient to fix this. */ /* don't forget not to return without! */ WM_cursor_wait(true); |