diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 75215cb..37d1d8c 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 22efee4..d8db40e 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -113,7 +113,7 @@ Public Class Main Public ResoSave As String = "6666x6666" Public ResoFunBackup As String = "6666x6666" - Public SubSprache As NameValuePair + Public SubSprache As NameValuePair = New NameValuePair("[ null ]", "", Nothing) Public SubSpracheEnum As New List(Of NameValuePair) Public SoftSubs As New List(Of String) Public IncludeLangName As Boolean = False @@ -510,7 +510,6 @@ Public Class Main LeadingZero = My.Settings.LeadingZero - SubSprache = SubSpracheEnum(0) For i As Integer = 0 To SubSpracheEnum.Count - 1 If SubSpracheEnum(i).CR_Value = My.Settings.Subtitle Then @@ -520,6 +519,10 @@ Public Class Main End If Next + 'If My.Settings.Subtitle = Nothing Then + + ' SubSprache = SubSpracheEnum(0) + 'End If Funimation_Bitrate = My.Settings.Funimation_Bitrate @@ -4232,7 +4235,7 @@ Public Class Main Sub FillArray() ' - SubSpracheEnum.Add(New NameValuePair("[ null ]", Nothing, Nothing)) + SubSpracheEnum.Add(New NameValuePair("[ null ]", "", Nothing)) SubSpracheEnum.Add(New NameValuePair("Deutsch", "de-DE", Nothing)) SubSpracheEnum.Add(New NameValuePair("English", "en-US", "en")) SubSpracheEnum.Add(New NameValuePair("Português (Brasil)", "pt-BR", "pt")) diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 64c1276..7bf411f 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 5ca462d..d48f179 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -204,26 +204,29 @@ Public Class Einstellungen AAuto.Checked = True End If - CB_CR_Harsubs.Items.Clear() + Try + CB_CR_Harsubs.Items.Clear() + For i As Integer = 0 To Main.SubSpracheEnum.Count - 1 + CB_CR_Harsubs.Items.Add(Main.SubSpracheEnum(i).Name) + If Main.SubSpracheEnum(i).CR_Value = Main.SubSprache.CR_Value Then + 'MsgBox(CB_CR_Harsubs.Items.Count.ToString) + 'MsgBox(i.ToString) + CB_CR_Harsubs.SelectedIndex = i + 'Exit For + End If - For i As Integer = 0 To Main.SubSpracheEnum.Count - 1 - CB_CR_Harsubs.Items.Add(Main.SubSpracheEnum(i).Name) - If Main.SubSpracheEnum(i).CR_Value = Main.SubSprache.CR_Value Then - 'MsgBox(CB_CR_Harsubs.Items.Count.ToString) - 'MsgBox(i.ToString) - CB_CR_Harsubs.SelectedIndex = i - 'Exit For - End If + Next + Catch ex As Exception + MsgBox(ex.ToString) + End Try - Next DD_Season_Prefix.Text = Main.Season_Prefix DD_Episode_Prefix.Text = Main.Episode_Prefix - NumericUpDown2.Value = Main.ErrorTolerance NumericUpDown1.Value = Main.MaxDL TextBox1.Text = Main.Startseite @@ -257,6 +260,7 @@ Public Class Einstellungen FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc" End If + If FFMPEG_CommandP1.Text = "-c:v libsvtav1" And FFMPEG_CommandP2.Text = "[no Preset]" Then FFMPEG_CommandP2.Enabled = False FFMPEG_CommandP3.Enabled = True @@ -461,6 +465,7 @@ Public Class Einstellungen Next + If CR_SoftSubDefault.SelectedItem.ToString = "English" Then Main.DefaultSubCR = "en-US" My.Settings.DefaultSubCR = Main.DefaultSubCR