Skip to content

Commit 2fba6d3

Browse files
committed
Fix switching from mux to batch not clearing stream list
1 parent 66f40fd commit 2fba6d3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ff-utils-winforms/Forms/MainForm.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ private async void fileListMode_SelectedIndexChanged(object sender, EventArgs e)
315315
RunTask.FileListMode newMode = (RunTask.FileListMode)fileListMode.SelectedIndex;
316316

317317
if (oldMode == RunTask.FileListMode.Mux && newMode == RunTask.FileListMode.Batch)
318-
TrackList.ClearCurrentFile();
318+
TrackList.ClearCurrentFile(true);
319319

320320
RunTask.currentFileListMode = newMode;
321321

@@ -337,10 +337,7 @@ private async void addTracksFromFileBtn_Click(object sender, EventArgs e)
337337

338338
foreach (ListViewItem item in fileList.SelectedItems.Cast<ListViewItem>())
339339
{
340-
//if (AreAnyTracksLoaded())
341-
await TrackList.AddStreamsToList(((FileListEntry)item.Tag).File, item.BackColor, true);
342-
//else
343-
// await TrackList.SetAsMainFile(item);
340+
await TrackList.AddStreamsToList(((FileListEntry)item.Tag).File, item.BackColor, true);
344341

345342
if (TrackList.current == null)
346343
await TrackList.SetAsMainFile(item);

ff-utils-winforms/UI/TrackList.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ class TrackList
2424
public static FileListEntry current;
2525
public static AudioConfiguration currentAudioConfig = null;
2626

27-
public static void ClearCurrentFile()
27+
public static void ClearCurrentFile(bool clearStreamList = false)
2828
{
2929
current = null;
3030
Program.mainForm.FfmpegOutputBox.Text = "";
31-
//Program.mainForm.streamList.Items.Clear();
31+
32+
if(clearStreamList)
33+
Program.mainForm.streamList.Items.Clear();
34+
3235
Program.mainForm.streamDetailsBox.Text = "";
3336
Program.mainForm.FormatInfoLabel.Text = "";
3437
Program.mainForm.MetaGrid.Columns.Clear();

0 commit comments

Comments
 (0)