[Bf-blender-cvs] [23c7d14] master: Fix another fullscreen toggle glitch

[Julian Eisel]

Commit: 23c7d14afdb0e5b6d56d4776b487bff6ab5d232c
Author: Julian Eisel
Date:   Thu May 28 19:48:28 2015 +0200
Branches: master
https://developer.blender.org/rB23c7d14afdb0e5b6d56d4776b487bff6ab5d232c

Fix another fullscreen toggle glitch

Steps to reproduce were: Set 3DView to fullscreen->render->toggle out of
fullscreen->escape->Area doesn't change back to 3DView

===================================================================

M	source/blender/editors/render/render_view.c

===================================================================

diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c
index fe357a7..f529c93 100644
--- a/source/blender/editors/render/render_view.c
+++ b/source/blender/editors/render/render_view.c
@@ -245,6 +245,11 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op))
 	ScrArea *sa = CTX_wm_area(C);
 	SpaceImage *sima = sa->spacedata.first;
 
+	/* ensure image editor fullscreen and area fullscreen states are in sync */
+	if ((sima->flag & SI_FULLWINDOW) && !sa->full) {
+		sima->flag &= ~SI_FULLWINDOW;
+	}
+
 	/* test if we have a temp screen in front */
 	if (win->screen->temp) {
 		wm_window_lower(win);
@@ -258,8 +263,9 @@ static int render_view_cancel_exec(bContext *C, wmOperator *UNUSED(op))
 			sima->flag &= ~SI_FULLWINDOW;
 			ED_screen_full_prevspace(C, sa);
 		}
-		else
+		else {
 			ED_area_prevspace(C, sa);
+		}
 
 		return OPERATOR_FINISHED;
 	}