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

Fix #107759: Crash when running modal operator in load_post handler

Browse Source 
Regression in [0] which caused the window to be NULL when the load_post
handler was called. While this can be worked around using
context.temp_override, keep the previous behavior as this
change wasn't intentional.

[0]: 46be42f6b1
This commit is contained in:
Campbell Barton
2023-05-12 17:23:56 +10:00
parent cddbd2dfb3
commit 95a114f3ca
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1070,12 +1070,20 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports)
}
WM_cursor_wait(false);
{
Main *bmain = CTX_data_main(C);
/* Temporarily set the window context as this was once supported, see: #107759. */
wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first);
wmWindow *win = static_cast<wmWindow *>(wm->windows.first);
BLI_assert(!CTX_wm_window(C));
Main *bmain = CTX_data_main(C);
BKE_callback_exec_string(
bmain, success ? BKE_CB_EVT_LOAD_POST : BKE_CB_EVT_LOAD_POST_FAIL, filepath);
CTX_wm_window_set(C, win);
BKE_callback_exec_string(
bmain, success ? BKE_CB_EVT_LOAD_POST : BKE_CB_EVT_LOAD_POST_FAIL, filepath);
CTX_wm_window_set(C, nullptr);
BLI_assert(BKE_main_namemap_validate(bmain));
BLI_assert(BKE_main_namemap_validate(bmain));
}
return success;
}
@@ -1457,10 +1465,20 @@ void wm_homefile_read_post(struct bContext *C,
wm_file_read_post(C, params_file_read_post);
if (params_file_read_post->use_data) {
BKE_callback_exec_string(CTX_data_main(C),
Main *bmain = CTX_data_main(C);
/* Temporarily set the window context as this was once supported, see: #107759. */
wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first);
wmWindow *win = static_cast<wmWindow *>(wm->windows.first);
BLI_assert(!CTX_wm_window(C));
CTX_wm_window_set(C, win);
BKE_callback_exec_string(bmain,
params_file_read_post->success ? BKE_CB_EVT_LOAD_POST :
BKE_CB_EVT_LOAD_POST_FAIL,
/* `filpath` (empty for home-file reading). */
"");
CTX_wm_window_set(C, nullptr);
}
if (params_file_read_post->is_alloc) {