[Bf-blender-cvs] [5cfda8e7f74] master: Fix crash closing File Browser window after closing temporary render window
Julian Eisel
noreply at git.blender.org
Wed Dec 23 15:40:23 CET 2020
Commit: 5cfda8e7f74da959a5c1081d45e7608bef95191d
Author: Julian Eisel
Date: Wed Dec 23 15:31:31 2020 +0100
Branches: master
https://developer.blender.org/rB5cfda8e7f74da959a5c1081d45e7608bef95191d
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.
===================================================================
M source/blender/editors/space_file/filesel.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list