aiden
/
lossless-cut
mirror of https://github.com/mifi/lossless-cut
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source
pull/901/head
Mikael Finstad 4 years ago
parent c11286eb21
commit 1e352a6d75
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/App.jsx
Unescape Escape View File

@ -673,7 +673,7 @@ const App = memo(() => {
return { cancel: false, newCustomOutDir }; return { cancel: false, newCustomOutDir };
}, [customOutDir, setCustomOutDir]); }, [customOutDir, setCustomOutDir]);
const userConcatFiles = useCallback(async ({ paths, includeAllStreams, streams, fileFormat: fileFormat2, isCustomFormatSelected: isCustomFormatSelected2 }) => { const userConcatFiles = useCallback(async ({ paths, includeAllStreams, streams, fileFormat: outFormat, isCustomFormatSelected: isCustomFormatSelected2 }) => {
if (workingRef.current) return; if (workingRef.current) return;
try { try {
setConcatDialogVisible(false); setConcatDialogVisible(false);
@ -683,7 +683,7 @@ const App = memo(() => {
const { newCustomOutDir, cancel } = await ensureAccessibleDirectories({ inputPath: firstPath }); const { newCustomOutDir, cancel } = await ensureAccessibleDirectories({ inputPath: firstPath });
if (cancel) return; if (cancel) return;
const ext = getOutFileExtension({ isCustomFormatSelected: isCustomFormatSelected2, outFormat: fileFormat2, filePath: firstPath }); const ext = getOutFileExtension({ isCustomFormatSelected: isCustomFormatSelected2, outFormat, filePath: firstPath });
const outPath = getOutPath({ customOutDir: newCustomOutDir, filePath: firstPath, nameSuffix: `merged${ext}` }); const outPath = getOutPath({ customOutDir: newCustomOutDir, filePath: firstPath, nameSuffix: `merged${ext}` });
const outDir = getOutDir(customOutDir, firstPath); const outDir = getOutDir(customOutDir, firstPath);
@ -694,7 +694,7 @@ const App = memo(() => {
} }
// console.log('merge', paths); // console.log('merge', paths);
await concatFiles({ paths, outPath, outDir, fileFormat: fileFormat2, includeAllStreams, streams, ffmpegExperimental, onProgress: setCutProgress, preserveMovData, movFastStart, preserveMetadataOnMerge, chapters: chaptersFromSegments }); await concatFiles({ paths, outPath, outDir, outFormat, includeAllStreams, streams, ffmpegExperimental, onProgress: setCutProgress, preserveMovData, movFastStart, preserveMetadataOnMerge, chapters: chaptersFromSegments });
openDirToast({ icon: 'success', dirPath: outDir, text: i18n.t('Files merged!') }); openDirToast({ icon: 'success', dirPath: outDir, text: i18n.t('Files merged!') });
} catch (err) { } catch (err) {
if (isOutOfSpaceError(err)) { if (isOutOfSpaceError(err)) {

Write Preview
Loading…
Cancel
Save