From 79cb18075e510b397eeb1cbca1cfce04a5ff2584 Mon Sep 17 00:00:00 2001 From: N00MKRAD Date: Tue, 23 Feb 2021 14:44:03 +0100 Subject: [PATCH] Fixed ffmpeg progress not working on trimmed inputs --- Code/Media/AvProcess.cs | 2 +- Code/UI/QuickSettingsTab.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Code/Media/AvProcess.cs b/Code/Media/AvProcess.cs index 7db8027..7d7b510 100644 --- a/Code/Media/AvProcess.cs +++ b/Code/Media/AvProcess.cs @@ -158,7 +158,7 @@ namespace Flowframes public static void UpdateFfmpegProgress(string ffmpegTime) { Form1 form = Program.mainForm; - long currInDuration = (form.currInDuration != form.currInDurationCut) ? form.currInDurationCut : form.currInDuration; + long currInDuration = (form.currInDurationCut < form.currInDuration) ? form.currInDurationCut : form.currInDuration; if (currInDuration < 1) { diff --git a/Code/UI/QuickSettingsTab.cs b/Code/UI/QuickSettingsTab.cs index 71e613d..c4f24e4 100644 --- a/Code/UI/QuickSettingsTab.cs +++ b/Code/UI/QuickSettingsTab.cs @@ -30,7 +30,7 @@ namespace Flowframes.UI if (endSecs <= startSecs) trimEndBox.Text = FormatUtils.SecsToTimestamp(startSecs + 1); - long dur = FormatUtils.TimestampToMs(trimStart, false) - FormatUtils.TimestampToMs(trimEnd, false); + long dur = FormatUtils.TimestampToMs(trimEnd, false) - FormatUtils.TimestampToMs(trimStart, false); Program.mainForm.currInDurationCut = dur; }