[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23132] branches/blender2.5/blender/source /blender/editors/screen/area.c: 2.5, Fix for bug #19296:

[Brecht Van Lommel]

Revision: 23132
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23132
Author:   blendix
Date:     2009-09-11 22:06:09 +0200 (Fri, 11 Sep 2009)

Log Message:
-----------
2.5, Fix for bug #19296:
render window escape incorrectly opens file browser.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/area.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-09-11 18:31:51 UTC (rev 23131)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c	2009-09-11 20:06:09 UTC (rev 23132)
@@ -1034,7 +1034,12 @@
 		}
 #endif
 
-		ED_area_newspace(C, sa, sl->next->spacetype);
+		/* workaround for case of double prevspace, render window
+		   with a file browser on top of it */
+		if(sl->next->spacetype == SPACE_FILE && sl->next->next)
+			ED_area_newspace(C, sa, sl->next->next->spacetype);
+		else
+			ED_area_newspace(C, sa, sl->next->spacetype);
 	}
 	else {
 		ED_area_newspace(C, sa, SPACE_INFO);