[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44035] trunk/blender/source/blender/ editors/space_sequencer/sequencer_add.c: fix for crash adding movie strips that were not a supported format.

Campbell Barton ideasman42 at gmail.com
Sat Feb 11 14:19:34 CET 2012


Revision: 44035
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44035
Author:   campbellbarton
Date:     2012-02-11 13:19:25 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
fix for crash adding movie strips that were not a supported format.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2012-02-11 12:23:23 UTC (rev 44034)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c	2012-02-11 13:19:25 UTC (rev 44035)
@@ -325,20 +325,22 @@
 			RNA_string_get(&itemptr, "name", file_only);
 			BLI_join_dirfile(seq_load.path, sizeof(seq_load.path), dir_only, file_only);
 
-			seq= seq_load_func(C, ed->seqbasep, &seq_load);
-
-			if(overlap == FALSE) {
-				if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene);
+			seq = seq_load_func(C, ed->seqbasep, &seq_load);
+			if (seq) {
+				if(overlap == FALSE) {
+					if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene);
+				}
 			}
 		}
 		RNA_END;
 	}
 	else {
 		/* single file */
-		seq= seq_load_func(C, ed->seqbasep, &seq_load);
-
-		if(overlap == FALSE) {
-			if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene);
+		seq = seq_load_func(C, ed->seqbasep, &seq_load);
+		if (seq) {
+			if(overlap == FALSE) {
+				if(seq_test_overlap(ed->seqbasep, seq)) shuffle_seq(ed->seqbasep, seq, scene);
+			}
 		}
 	}
 




More information about the Bf-blender-cvs mailing list