Removing 1st file from list no longer clears stream list and instead loads details of new 1st file

Author: n00mkrad

ff-utils-winforms/Forms/MainForm.cs

@@ -78,7 +78,7 @@ private async void MainForm_Shown(object sender, EventArgs e)
             encAudioCodec_SelectedIndexChanged(null, null);
             encSubCodec_SelectedIndexChanged(null, null);
             av1anAudCodec_SelectedIndexChanged(null, null);
-            RefreshFileListUi();
+            await RefreshFileListUi();
             initialized = true;
 
             if (Program.args.Where(x => x.StartsWith("package=")).Count() == 1)
@@ -285,7 +285,7 @@ public void SetButtonActive(Control c, bool state)
 
         #region FileList
 
-        public void RefreshFileListUi()
+        public async Task RefreshFileListUi()
         {
             bool anySelected = fileList.SelectedItems.Count > 0;
             bool oneSelected = fileList.SelectedItems.Count == 1;
@@ -301,7 +301,12 @@ public void RefreshFileListUi()
                 $"{(count > 1 && RunTask.currentFileListMode == RunTask.FileListMode.Mux ? "Double click any of them or use the Load Tracks button to load their tracks." : "")}";
 
             if (TrackList.current != null && !fileList.Items.Cast<ListViewItem>().Select(x => ((FileListEntry)x.Tag)).Any(x => x.File.Equals(TrackList.current.File)))
+            {
                 TrackList.ClearCurrentFile();
+
+                if (RunTask.currentFileListMode == RunTask.FileListMode.Mux)
+                    await TrackList.SetAsMainFile(fileList.Items[0], false);
+            }
         }
 
         private async void fileListMode_SelectedIndexChanged(object sender, EventArgs e)
@@ -317,12 +322,12 @@ private async void fileListMode_SelectedIndexChanged(object sender, EventArgs e)
             Text = $"NMKODER [{(RunTask.currentFileListMode == RunTask.FileListMode.Mux ? "Mux" : "Batch")}]";
 
             SaveUiConfig();
-            RefreshFileListUi();
+            await RefreshFileListUi();
 
             if (oldMode == RunTask.FileListMode.Batch && newMode == RunTask.FileListMode.Mux)
             {
                 if (fileList.Items.Count == 1 && !AreAnyTracksLoaded())
-                    await TrackList.LoadFirstFile(fileList.Items[0]);
+                    await TrackList.SetAsMainFile(fileList.Items[0]);
             }
         }
 
@@ -332,10 +337,13 @@ private async void addTracksFromFileBtn_Click(object sender, EventArgs e)
 
             foreach (ListViewItem item in fileList.SelectedItems.Cast<ListViewItem>())
             {
-                if (AreAnyTracksLoaded())
+                //if (AreAnyTracksLoaded())
                     await TrackList.AddStreamsToList(((FileListEntry)item.Tag).File, item.BackColor, true);
-                else
-                    await TrackList.LoadFirstFile(item);
+                //else
+                //    await TrackList.SetAsMainFile(item);
+
+                if (TrackList.current == null)
+                    await TrackList.SetAsMainFile(item);
             }
 
             QuickConvertUi.LoadMetadataGrid();

ff-utils-winforms/Main/RunTask.cs

@@ -116,7 +116,7 @@ public static async Task StartBatch()
                 FileListEntry entry = (FileListEntry)taskItems[i].Tag;
                 Logger.Log($"Queue: Starting task {i + 1}/{taskItems.Length} for {entry.File.Name}.");
                 TrackList.ClearCurrentFile();
-                await TrackList.LoadFirstFile(taskItems[i], false, false); // Load file info
+                await TrackList.SetAsMainFile(taskItems[i], false, false); // Load file info
                 await Start(batchTask); // Run task
             }
 

ff-utils-winforms/UI/FileList.cs

@@ -51,7 +51,10 @@ public static async Task HandleFiles(string[] paths, bool clearExisting)
             LoadFiles(paths, clearExisting);
 
             if (RunTask.currentFileListMode == RunTask.FileListMode.Mux && Program.mainForm.fileListBox.Items.Count == 1)
-                await TrackList.LoadFirstFile(Program.mainForm.fileListBox.Items[0]);
+            {
+                await TrackList.SetAsMainFile(Program.mainForm.fileListBox.Items[0]);
+                await TrackList.AddStreamsToList(((FileListEntry)Program.mainForm.fileListBox.Items[0].Tag).File, Program.mainForm.fileListBox.Items[0].BackColor, true);
+            }
 
             if (runInstantly)
                 Program.mainForm.runBtn_Click();

ff-utils-winforms/UI/Tasks/Av1an.cs

@@ -40,7 +40,7 @@ public static async Task RunResumeWithNewArgs(string sourceFile, string override
                 Program.mainForm.fileListBox.Items.Cast<ListViewItem>().ToList().ForEach(x => x.Selected = false); 
                 Program.mainForm.fileListBox.Items.Cast<ListViewItem>().First().Selected = true; // Force MFM
                 FileList.LoadFiles(new string[1] { sourceFile }, true); // Add input file
-                await TrackList.LoadFirstFile(Program.mainForm.fileListBox.Items[0]); // Load file
+                await TrackList.SetAsMainFile(Program.mainForm.fileListBox.Items[0]); // Load file
             }
 
             await Run(true, overrideTempDir, "");

ff-utils-winforms/UI/ThumbnailView.cs

@@ -79,16 +79,14 @@ public static async Task GenerateThumbs(string path)
 
                     foreach (FileInfo pick in picks)
                     {
-
                         pick.CopyTo(Path.Combine(Paths.GetThumbsPath(), $"thumb{idx}{pick.Extension}"));
-                        //IoUtils.GetImage(pick.FullName).Save(Path.Combine(Paths.GetThumbsPath(), $"thumb{idx}.{format}"), ImageFormat.Jpeg);
                         idx++;
                     }
                 }
             }
             catch (Exception e)
             {
-                Logger.Log("GetThumbnails Error: " + e.Message, true);
+                Logger.Log($"GetThumbnails Error: {e.Message}\n{e.StackTrace}", true);
             }
 
             RemoveInvalidImages();

ff-utils-winforms/UI/TrackList.cs

@@ -28,7 +28,7 @@ public static void ClearCurrentFile()
         {
             current = null;
             Program.mainForm.FfmpegOutputBox.Text = "";
-            Program.mainForm.streamList.Items.Clear();
+            //Program.mainForm.streamList.Items.Clear();
             Program.mainForm.streamDetailsBox.Text = "";
             Program.mainForm.FormatInfoLabel.Text = "";
             Program.mainForm.MetaGrid.Columns.Clear();
@@ -38,7 +38,7 @@ public static void ClearCurrentFile()
             Av1anUi.currentCropValues = null;
         }
 
-        public static async Task LoadFirstFile(ListViewItem item, bool switchToTrackList = true, bool generateThumbs = true)
+        public static async Task SetAsMainFile(ListViewItem item, bool switchToTrackList = true, bool generateThumbs = true)
         {
             MediaFile mediaFile = ((FileListEntry)item.Tag).File;
             int streamCount = await FfmpegUtils.GetStreamCount(mediaFile.ImportPath);
@@ -53,7 +53,7 @@ public static async Task LoadFirstFile(ListViewItem item, bool switchToTrackList
             Program.mainForm.FormatInfoLabel.Text = $"{titleStr}Format: {current.File.Format} - Duration: {dur}{br} - Size: {FormatUtils.Bytes(current.File.Size)}";
             Program.mainForm.streamList.Items.Clear();
             currentAudioConfig = null;
-            await AddStreamsToList(current.File, item.BackColor, switchToTrackList);
+            //await AddStreamsToList(current.File, item.BackColor, switchToTrackList);
 
             QuickConvertUi.InitFile(current.File.SourcePath);
             Av1anUi.InitFile(current.File.SourcePath);