[Bf-blender-cvs] [e066a33] master: Fix crash setting the screen when one is maximized

[Campbell Barton]

Commit: e066a3331470b90decae5a897e314c3fe0c1703b
Author: Campbell Barton
Date:   Wed Aug 26 11:27:13 2015 +1000
Branches: master
https://developer.blender.org/rBe066a3331470b90decae5a897e314c3fe0c1703b

Fix crash setting the screen when one is maximized

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

M	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 b714eb0..430597e 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1487,7 +1487,8 @@ void ED_screen_set(bContext *C, bScreen *sc)
 		return;
 	
 
-	if (sc->state == SCREENFULL) {             /* find associated full */
+	if (ELEM(sc->state, SCREENMAXIMIZED, SCREENFULL)) {
+		/* find associated full */
 		bScreen *sc1;
 		for (sc1 = bmain->screen.first; sc1; sc1 = sc1->id.next) {
 			ScrArea *sa = sc1->areabase.first;