From 8826d45397d1e150d9b52968c66b5bca354b9031 Mon Sep 17 00:00:00 2001
From: N00MKRAD <me@nmkd.de>
Date: Sun, 28 Feb 2021 16:26:46 +0100
Subject: [PATCH] Fixed end of video getting trimmed when it shouldn't

---
 Code/Form1.cs               | 2 +-
 Code/Media/FfmpegExtract.cs | 7 ++++++-
 Code/UI/QuickSettingsTab.cs | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Code/Form1.cs b/Code/Form1.cs
index 7a5daf4..4cac5dd 100644
--- a/Code/Form1.cs
+++ b/Code/Form1.cs
@@ -525,4 +525,4 @@ namespace Flowframes
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/Code/Media/FfmpegExtract.cs b/Code/Media/FfmpegExtract.cs
index 53b43cf..ea27dc0 100644
--- a/Code/Media/FfmpegExtract.cs
+++ b/Code/Media/FfmpegExtract.cs
@@ -79,7 +79,12 @@ namespace Flowframes.Media
             if (!QuickSettingsTab.trimEnabled)
                 return "";
 
-            return $"-ss {QuickSettingsTab.trimStart} -to {QuickSettingsTab.trimEnd}";
+            string arg = $"-ss {QuickSettingsTab.trimStart}";
+
+            if(QuickSettingsTab.doTrimEnd)
+                arg += $" -to {QuickSettingsTab.trimEnd}";
+
+            return arg;
         }
 
         public static async Task ImportSingleImage(string inputFile, string outPath, Size size)
diff --git a/Code/UI/QuickSettingsTab.cs b/Code/UI/QuickSettingsTab.cs
index c4f24e4..dfb16b7 100644
--- a/Code/UI/QuickSettingsTab.cs
+++ b/Code/UI/QuickSettingsTab.cs
@@ -16,6 +16,7 @@ namespace Flowframes.UI
     class QuickSettingsTab
     {
         public static bool trimEnabled;
+        public static bool doTrimEnd;
         public static string trimStart;
         public static string trimEnd;
 
@@ -32,6 +33,8 @@ namespace Flowframes.UI
 
             long dur = FormatUtils.TimestampToMs(trimEnd, false) - FormatUtils.TimestampToMs(trimStart, false);
             Program.mainForm.currInDurationCut = dur;
+
+            doTrimEnd = FormatUtils.TimestampToMs(trimEnd, false) != FormatUtils.TimestampToMs(FormatUtils.MsToTimestamp(Program.mainForm.currInDuration), false);
         }
 
         public static string GetTrimEndMinusOne ()