[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59023] trunk/blender/source/blender/ editors/screen/screen_edit.c: Fix #36243: one screen should never be used by multiple windows, but this could

[Brecht Van Lommel]

Revision: 59023
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59023
Author:   blendix
Date:     2013-08-08 17:05:09 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
Fix #36243: one screen should never be used by multiple windows, but this could
happen when a screen was maximized to a single editor, now that case is disabled
too.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2013-08-08 17:02:00 UTC (rev 59022)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2013-08-08 17:05:09 UTC (rev 59023)
@@ -1378,10 +1378,7 @@
 	if (id == NULL)
 		return;
 	
-	/* check for valid winid */
-	if (sc->winid != 0 && sc->winid != win->winid)
-		return;
-	
+
 	if (sc->full) {             /* find associated full */
 		bScreen *sc1;
 		for (sc1 = bmain->screen.first; sc1; sc1 = sc1->id.next) {
@@ -1392,6 +1389,10 @@
 			}
 		}
 	}
+
+	/* check for valid winid */
+	if (sc->winid != 0 && sc->winid != win->winid)
+		return;
 	
 	if (oldscreen != sc) {
 		wmTimer *wt = oldscreen->animtimer;