[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17830] branches/blender2.5/blender/source /blender/blenkernel/intern/screen.c: 2.5 - Fixed crashes when merging areas

[Joshua Leung]

Revision: 17830
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17830
Author:   aligorith
Date:     2008-12-14 10:11:31 +0100 (Sun, 14 Dec 2008)

Log Message:
-----------
2.5 - Fixed crashes when merging areas

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c	2008-12-14 08:32:21 UTC (rev 17829)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c	2008-12-14 09:11:31 UTC (rev 17830)
@@ -135,17 +135,19 @@
 /* not region itself */
 void BKE_area_region_free(ARegion *ar)
 {
-	if(ar->type && ar->type->free)
+	if(ar && ar->type && ar->type->free)
 		ar->type->free(ar);
 }
 
 /* not area itself */
 void BKE_screen_area_free(ScrArea *sa)
 {
-	ARegion *ar;
+	ARegion *ar, *arn;
 	
-	for(ar=sa->regionbase.first; ar; ar=ar->next)
+	for(ar=sa->regionbase.first; ar; ar=arn) {
+		arn= ar->next;
 		BKE_area_region_free(ar);
+	}
 
 	BKE_spacedata_freelist(&sa->spacedata);