griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #107525: Crash loading pre 2.5x files with multiple windows open

Browse Source
This commit is contained in:
Campbell Barton
2023-05-02 13:36:16 +10:00
parent b6a7b786c6
commit ae76fa2da3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/intern/wm_files.cc
View File

@@ -286,7 +286,7 @@ static void wm_window_match_keep_current_wm(const bContext *C,
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
WorkSpace *workspace;
BKE_workspace_layout_find_global(bmain, screen, &workspace);
WorkSpaceLayout *layout_old = BKE_workspace_layout_find_global(bmain, screen, &workspace);
BKE_workspace_active_set(win->workspace_hook, workspace);
win->scene = CTX_data_scene(C);
@@ -295,7 +295,9 @@ static void wm_window_match_keep_current_wm(const bContext *C,
WM_window_set_active_screen(win, workspace, screen);
}
else {
#if 0 /* NOTE(@ideasman42): The screen referenced from the window has been freed, see: 107525. */
WorkSpaceLayout *layout_old = WM_window_get_active_layout(win);
#endif
WorkSpaceLayout *layout_new = ED_workspace_layout_duplicate(
bmain, workspace, layout_old, win);