Fix "Open Clip" operator in Clip Editor broken

Steps to reproduce were:
- Open Clip Editor
- Call "Open Clip" (e.g. Alt+O)
- Select video file

The file wouldn't be loaded into the Clip Editor.

Caused by 7849b56c3c.
This commit is contained in:
Julian Eisel 2022-05-11 13:16:54 +02:00
parent d91711bc85
commit 0e6d70fec9
1 changed files with 8 additions and 2 deletions

View File

@ -4087,7 +4087,11 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
/* Close any popups, like when opening a file browser from the splash. */
UI_popup_handlers_remove_all(C, &root_win->modalhandlers);
CTX_wm_window_set(C, root_win);
/* Setting the context window unsets the context area & screen. Avoid doing that, so operators
* calling the file browser can operate in the context the browser was opened in. */
if (ctx_win != root_win) {
CTX_wm_window_set(C, root_win);
}
/* The root window may already have a File Browser open. Cancel it if so, only 1 should be open
* per window. The root context of this operation is also used for the new operation. */
@ -4142,7 +4146,9 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
WM_event_fileselect_event(wm, op, EVT_FILESELECT_FULL_OPEN);
CTX_wm_window_set(C, ctx_win);
if (ctx_win != root_win) {
CTX_wm_window_set(C, ctx_win);
}
}
/** \} */