From a72ebd04d5e2685fba53aa0c5008490727eb4ca2 Mon Sep 17 00:00:00 2001
From: Nikolaj Olsson <nikse.dk@gmail.com>
Date: Mon, 29 Apr 2024 18:22:47 +0200
Subject: [PATCH] Fix sort en gen video w hardsub

---
 src/ui/Forms/GenerateVideoWithHardSubs.cs | 40 ++++++++++++++++-------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/ui/Forms/GenerateVideoWithHardSubs.cs b/src/ui/Forms/GenerateVideoWithHardSubs.cs
index fad969fe1..722e7ca6a 100644
--- a/src/ui/Forms/GenerateVideoWithHardSubs.cs
+++ b/src/ui/Forms/GenerateVideoWithHardSubs.cs
@@ -979,12 +979,18 @@ namespace Nikse.SubtitleEdit.Forms
                 if (_abort)
                 {
                     process.Kill();
+                    return false;
                 }
 
                 var v = (int)_processedFrames;
                 SetProgress(v);
             }
 
+            if (_abort)
+            {
+                return false;
+            }
+
             if (process.ExitCode != 0)
             {
                 _log.AppendLine("ffmpeg exit code: " + process.ExitCode);
@@ -2113,6 +2119,7 @@ namespace Nikse.SubtitleEdit.Forms
                 try
                 {
                     Cursor = Cursors.WaitCursor;
+                    Refresh();
                     Application.DoEvents();
                     for (var i = 0; i < listViewBatch.Columns.Count; i++)
                     {
@@ -2121,6 +2128,7 @@ namespace Nikse.SubtitleEdit.Forms
 
                     foreach (var fileName in openFileDialog1.FileNames)
                     {
+                        Application.DoEvents();
                         AddInputFile(fileName);
                     }
                 }
@@ -2297,13 +2305,14 @@ namespace Nikse.SubtitleEdit.Forms
                 return;
             }
 
-            try
-            {
-                var fileNames = (string[])e.Data.GetData(DataFormats.FileDrop);
-                labelPleaseWait.Visible = true;
+            var fileNames = (string[])e.Data.GetData(DataFormats.FileDrop);
+            labelPleaseWait.Visible = true;
 
-                TaskDelayHelper.RunDelayed(TimeSpan.FromMilliseconds(5), () =>
+            TaskDelayHelper.RunDelayed(TimeSpan.FromMilliseconds(5), () =>
+            {
+                try
                 {
+                    Cursor = Cursors.WaitCursor;
                     foreach (var fileName in fileNames)
                     {
                         if (FileUtil.IsDirectory(fileName))
@@ -2312,15 +2321,17 @@ namespace Nikse.SubtitleEdit.Forms
                         }
                         else
                         {
+                            Application.DoEvents();
                             AddInputFile(fileName);
                         }
                     }
-                });
-            }
-            finally
-            {
-                labelPleaseWait.Visible = false;
-            }
+                }
+                finally
+                {
+                    Cursor = Cursors.Default;
+                    labelPleaseWait.Visible = false;
+                }
+            });
         }
 
         private void SearchFolder(string path)
@@ -2418,6 +2429,11 @@ namespace Nikse.SubtitleEdit.Forms
                 return;
             }
 
+            for (var i = 0; i < listViewBatch.Columns.Count; i++)
+            {
+                ListViewSorter.SetSortArrow(listViewBatch.Columns[i], SortOrder.None);
+            }
+
             var lv = (ListView)sender;
             if (!(lv.ListViewItemSorter is ListViewSorter sorter))
             {
@@ -2436,6 +2452,8 @@ namespace Nikse.SubtitleEdit.Forms
             else
             {
                 sorter.ColumnNumber = e.Column;
+                sorter.Descending = false;
+                sorter.IsDisplayFileSize = e.Column == ListViewBatchSubItemIndexColumnVideoSize;
             }
 
             lv.Sort();