From 0a28bb14222c7753a987256a9c155b670137ee37 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sat, 9 Mar 2019 16:58:13 +0100 Subject: Fix stashed full-screens returning to wrong layout Steps to reproduce were: * Maximize area (Shift+Spacebar in 2.7, Ctrl+Spacebar in 2.8) * Open temp file browser (Ctrl+O) * Cancel file browser (Esc) - should return to previous full-screen * Press "Return to Previous" button The previously maximized area would turn into a file-browser. Note that the issue will still happen when opening old files saved while in maximized area full-screen. --- source/blender/editors/screen/screen_edit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/screen/screen_edit.c') diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 2754b78d74a..f777b42c5bd 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1527,7 +1527,8 @@ void ED_screen_restore_temp_type(bContext *C, ScrArea *sa) if (sa->flag & AREA_FLAG_TEMP_TYPE) { ED_area_prevspace(C, sa); - sa->flag &= ~AREA_FLAG_TEMP_TYPE; + /* Flag should be cleared now. */ + BLI_assert((sa->flag & AREA_FLAG_TEMP_TYPE) == 0); } if (sa->full) { -- cgit v1.2.3