Hotfix broken merging (v1.4.10)

philipbutkiewicz · Nov 29, 2024 · 4a16c0b · 4a16c0b
1 parent 68826c9
commit 4a16c0b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -437,7 +437,6 @@ public void Merge(string originalFileName, List<string> toMerge, string containe
 
             progressDialog = new ProgressDialog();
             progressDialog.ProgressTitle = Resources.MergingFiles;
-            progressDialog.ShowDialog();
         }
 
         /// <summary>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Fri 11/29/2024 1:52:29.42
		Fri 11/29/2024 2:13:41.74