forked from 0x2620/pandora
fix timeline for edits with 0 duration clips
This commit is contained in:
parent
0a7b6c0452
commit
0ba80ada1f
2 changed files with 7 additions and 0 deletions
|
@ -673,6 +673,10 @@ pandora.ui.editPanel = function(isEmbed) {
|
|||
timelineIteration = self.timelineIteration = Ox.uid();
|
||||
Ox.serialForEach(edit.clips, function(clip) {
|
||||
var callback = Ox.last(arguments);
|
||||
if (!clip.duration) {
|
||||
callback()
|
||||
return;
|
||||
}
|
||||
pandora[
|
||||
fps == 1 ? 'getSmallClipTimelineURL' : 'getLargeClipTimelineURL'
|
||||
](clip.item, clip['in'], clip.out, ui.videoTimeline, function(url) {
|
||||
|
|
|
@ -1761,6 +1761,9 @@ pandora.getLargeEditTimelineURL = function(edit, type, i, callback) {
|
|||
if (clipIn >= timelineOut) {
|
||||
return false; // break
|
||||
}
|
||||
if (!clip.duration) {
|
||||
return;
|
||||
}
|
||||
if (
|
||||
(timelineIn <= clipIn && clipIn <= timelineOut)
|
||||
|| (timelineIn <= clipOut && clipOut <= timelineOut)
|
||||
|
|
Loading…
Reference in a new issue