fix color bug

pull/901/head
Mikael Finstad 5 years ago
parent 392962729a
commit a37eedc337
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26

@ -161,8 +161,8 @@ const App = memo(() => {
}, []); }, []);
const createIndexedSegment = useCallback(({ segment, incrementCount } = {}) => { const createIndexedSegment = useCallback(({ segment, incrementCount } = {}) => {
const ret = createSegment({ segIndex: segCounterRef.current, ...segment });
if (incrementCount) segCounterRef.current += 1; if (incrementCount) segCounterRef.current += 1;
const ret = createSegment({ segIndex: segCounterRef.current, ...segment });
return ret; return ret;
}, []); }, []);
@ -1352,7 +1352,7 @@ const App = memo(() => {
const getNewName = (oldName, suffix) => oldName && `${segment.name} ${suffix}`; const getNewName = (oldName, suffix) => oldName && `${segment.name} ${suffix}`;
const firstPart = createIndexedSegment({ segment: { name: getNewName(segment.name, '1'), start: segment.start, end: currentTime }, incrementCount: true }); const firstPart = createIndexedSegment({ segment: { name: getNewName(segment.name, '1'), start: segment.start, end: currentTime }, incrementCount: false });
const secondPart = createIndexedSegment({ segment: { name: getNewName(segment.name, '2'), start: currentTime, end: segment.end }, incrementCount: true }); const secondPart = createIndexedSegment({ segment: { name: getNewName(segment.name, '2'), start: currentTime, end: segment.end }, incrementCount: true });
const newSegments = [...cutSegments]; const newSegments = [...cutSegments];
@ -1375,8 +1375,9 @@ const App = memo(() => {
clearSegCounter(); clearSegCounter();
} }
setCutSegments((existingSegments) => { setCutSegments((existingSegments) => {
const newSegments = validEdl.map((segment) => createIndexedSegment({ segment, incrementCount: true })); const needToAppend = append && existingSegments.length > 1;
if (append && existingSegments.length > 1) return [...existingSegments, ...newSegments]; const newSegments = validEdl.map((segment, i) => createIndexedSegment({ segment, incrementCount: needToAppend || i > 0 }));
if (needToAppend) return [...existingSegments, ...newSegments];
return newSegments; return newSegments;
}); });
}, [clearSegCounter, createIndexedSegment, setCutSegments]); }, [clearSegCounter, createIndexedSegment, setCutSegments]);

Loading…
Cancel
Save