[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13546] trunk/blender/source/blender/src/ sequence.c: == Sequencer ==

[Peter Schlaile]

Revision: 13546
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13546
Author:   schlaile
Date:     2008-02-03 20:10:19 +0100 (Sun, 03 Feb 2008)

Log Message:
-----------
== Sequencer ==

Silently destroyed a null check in free_sequence in last commit,
getting old... :)

Modified Paths:
--------------
    trunk/blender/source/blender/src/sequence.c

Modified: trunk/blender/source/blender/src/sequence.c
===================================================================
--- trunk/blender/source/blender/src/sequence.c	2008-02-03 19:03:18 UTC (rev 13545)
+++ trunk/blender/source/blender/src/sequence.c	2008-02-03 19:10:19 UTC (rev 13546)
@@ -114,7 +114,9 @@
 		return;
 	}
 
-	MEM_freeN(strip->stripdata);
+	if (strip->stripdata) {
+		MEM_freeN(strip->stripdata);
+	}
 
 	if (strip->proxy) {
 		MEM_freeN(strip->proxy);
@@ -1021,6 +1023,10 @@
 	int frameno;
 	char dir[FILE_MAXDIR];
 
+	if (!seq->strip->proxy) {
+		return FALSE;
+	}
+
 	if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
 		strcpy(dir, seq->strip->proxy->dir);
 	} else {
@@ -1056,11 +1062,6 @@
 			 G.scene->r.size);
 	}
 
-	if (seq->strip->proxy == 0) {
-		return FALSE;
-	}
-
-
 	BLI_convertstringcode(name, G.sce, frameno);
 
 	strcat(name, ".jpg");