fix #543
This commit is contained in:
hama3254 2022-10-14 14:33:23 +02:00
parent b6e8ff53b2
commit c8d816c95b
4 changed files with 5 additions and 5 deletions

Binary file not shown.

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.8.9")>
<Assembly: AssemblyFileVersion("3.8.9")>
<Assembly: AssemblyVersion("3.8.9.3")>
<Assembly: AssemblyFileVersion("3.8.9.3")>
<Assembly: NeutralResourcesLanguage("en")>

View File

@ -533,7 +533,7 @@ Partial Class Einstellungen
Me.CB_Merge.FormattingEnabled = True
Me.CB_Merge.IntegralHeight = False
Me.CB_Merge.ItemHeight = 23
Me.CB_Merge.Items.AddRange(New Object() {"[Merge Disabeld]"})
Me.CB_Merge.Items.AddRange(New Object() {"[merge disabled]"})
Me.CB_Merge.Location = New System.Drawing.Point(265, 25)
Me.CB_Merge.Name = "CB_Merge"
Me.CB_Merge.Size = New System.Drawing.Size(175, 29)

View File

@ -1230,14 +1230,14 @@ Public Class Einstellungen
ElseIf CB_Format.Text = "MP4" Then
CB_Merge.SelectedIndex = 0
CB_Merge.Items.Clear()
CB_Merge.Items.Add("[Merge Disabeld]") 'mov_text
CB_Merge.Items.Add("[merge disabled]") 'mov_text
CB_Merge.Items.Add("mov_text")
'CB_Merge.Items.Add("srt")
CB_Merge.SelectedItem = Main.MergeSubsFormat
ElseIf CB_Format.Text = "MKV" Then
CB_Merge.SelectedIndex = 0
CB_Merge.Items.Clear()
CB_Merge.Items.Add("[Merge Disabeld]")
CB_Merge.Items.Add("[merge disabled]")
CB_Merge.Items.Add("copy")
CB_Merge.Items.Add("srt")
CB_Merge.SelectedItem = Main.MergeSubsFormat