[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25561] trunk/blender/source/blender/ editors: - closing the user prefs accessed the temp screen after removing it.

[Campbell Barton]

Revision: 25561
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25561
Author:   campbellbarton
Date:     2009-12-26 01:17:45 +0100 (Sat, 26 Dec 2009)

Log Message:
-----------
- closing the user prefs accessed the temp screen after removing it.
- colorband drawing could use un-initialized vars (probably wouldnt crash)

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

Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c	2009-12-25 23:59:12 UTC (rev 25560)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2009-12-26 00:17:45 UTC (rev 25561)
@@ -698,7 +698,7 @@
 	float x1, y1, sizex, sizey;
 	float dx, v3[2], v1[2], v2[2], v1a[2], v2a[2];
 	int a;
-	float pos, colf[4];
+	float pos, colf[4]= {0,0,0,0}; /* initialize incase the colorband isnt valid */
 		
 	coba= (ColorBand *)(but->editcoba? but->editcoba: but->poin);
 	if(coba==NULL) return;

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2009-12-25 23:59:12 UTC (rev 25560)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2009-12-26 00:17:45 UTC (rev 25561)
@@ -1124,13 +1124,14 @@
 	/* mark it available for use for other windows */
 	screen->winid= 0;
 	
+	/* before deleting the temp screen or we get invalid access */
+	CTX_wm_window_set(C, prevwin);
+	
 	/* if temp screen, delete it */
 	if(screen->full == SCREENTEMP) {
 		Main *bmain= CTX_data_main(C);
 		free_libblock(&bmain->screen, screen);
 	}
-	
-	CTX_wm_window_set(C, prevwin);
 }
 
 /* *********************************** */