diff options
| author | Julian Eisel <julian@blender.org> | 2020-12-23 17:31:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-12-23 17:31:31 +0300 |
| commit | 5cfda8e7f74da959a5c1081d45e7608bef95191d (patch) | |
| tree | 51b0cb0acba0aef39ec2a4e5b55032afe2a449c8 /source/blender/editors | |
| parent | 21cb28802965fa20cace5edd56575fcce7df0581 (diff) | |
Fix crash closing File Browser window after closing temporary render window
This seems to be a longer standing issue. Steps to reproduce were:
* With factory settings, Ctrl+O then F12
* Close the render window using the window close button
* Close the File Browser window using the window close button
This could be OS specific though, at least on macOS this caused a crash.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index b919a30e6cd..6b74b344375 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -1142,7 +1142,9 @@ void ED_fileselect_exit(wmWindowManager *wm, Scene *owner_scene, SpaceFile *sfil return; } if (sfile->op) { - wmWindow *temp_win = WM_window_is_temp_screen(wm->winactive) ? wm->winactive : NULL; + wmWindow *temp_win = (wm->winactive && WM_window_is_temp_screen(wm->winactive)) ? + wm->winactive : + NULL; if (temp_win) { int win_size[2]; bool is_maximized; |