From 4a16c0bcda8eb64433db407150776aa0133d98bb Mon Sep 17 00:00:00 2001
From: Philip Butkiewicz <philip@kenja.com>
Date: Fri, 29 Nov 2024 02:13:43 +0100
Subject: [PATCH] Hotfix broken merging (v1.4.10)

---
 SharpCut.sln                     | 1 +
 SharpCut/Resources/BuildDate.txt | 2 +-
 SharpCutCommon/Video/Project.cs  | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SharpCut.sln b/SharpCut.sln
index 86a5e08..8e2e6c2 100644
--- a/SharpCut.sln
+++ b/SharpCut.sln
@@ -32,6 +32,7 @@ Global
 		{FAF3538D-9196-4355-8BE2-4DB3E5CA82D8}.Debug|x64.ActiveCfg = Debug|x64
 		{FAF3538D-9196-4355-8BE2-4DB3E5CA82D8}.Debug|x64.Build.0 = Debug|x64
 		{FAF3538D-9196-4355-8BE2-4DB3E5CA82D8}.Release|x64.ActiveCfg = Release|x64
+		{FAF3538D-9196-4355-8BE2-4DB3E5CA82D8}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SharpCut/Resources/BuildDate.txt b/SharpCut/Resources/BuildDate.txt
index 4ff53fd..de6c48a 100644
--- a/SharpCut/Resources/BuildDate.txt
+++ b/SharpCut/Resources/BuildDate.txt
@@ -1 +1 @@
-Fri 11/29/2024  1:52:29.42 
+Fri 11/29/2024  2:13:41.74 
diff --git a/SharpCutCommon/Video/Project.cs b/SharpCutCommon/Video/Project.cs
index 71e8f58..1b0278d 100644
--- a/SharpCutCommon/Video/Project.cs
+++ b/SharpCutCommon/Video/Project.cs
@@ -437,7 +437,6 @@ public void Merge(string originalFileName, List<string> toMerge, string containe
 
             progressDialog = new ProgressDialog();
             progressDialog.ProgressTitle = Resources.MergingFiles;
-            progressDialog.ShowDialog();
         }
 
         /// <summary>