From 4f9494715719d563d7f45210e45aa3056535a09b Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Mon, 8 Jun 2015 15:59:32 +0200 Subject: Fix T44976: 3D View turns into an Image Editor after saving render result Was a case of two stacked temporary fullscreens, so a quite extreme situation. --- source/blender/windowmanager/intern/wm_event_system.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager/intern/wm_event_system.c') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 5177e85e827..889a36b6953 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1793,7 +1793,11 @@ static int wm_handler_fileselect_do(bContext *C, ListBase *handlers, wmEventHand BLI_remlink(handlers, handler); if (val != EVT_FILESELECT_EXTERNAL_CANCEL) { - ED_screen_full_prevspace(C, CTX_wm_area(C)); + ScrArea *sa = CTX_wm_area(C); + const SpaceLink *sl = sa->spacedata.first; + const bool was_prev_temp = (sl->next && sl->next->spacetype == SPACE_IMAGE); + + ED_screen_full_prevspace(C, sa, was_prev_temp); } wm_handler_op_context(C, handler, CTX_wm_window(C)->eventstate); -- cgit v1.2.3