diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 17:19:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-11 17:19:25 +0400 |
commit | 5e1f6f01740714fd51df4b4d249b0590261ebd8c (patch) | |
tree | eec0320189ecd97a6ad3a33503c5f38564d3d0c3 /source/blender/editors/space_sequencer/sequencer_add.c | |
parent | 2ff2d345f5588091011522b6126f8f85c732e996 (diff) |
fix for crash adding movie strips that were not a supported format.
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_add.c')
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_add.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 66aefc72f33..9aed4b3d78a 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -325,20 +325,22 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad 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); + } } } |