diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 2c4ddfc..8723764 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb index c17d877..192fec8 100644 --- a/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb +++ b/Crunchyroll Downloader/CheckBoxComboBox.Designer.vb @@ -34,7 +34,7 @@ Partial Class CheckBoxComboBox ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None Me.BorderStyle = MetroFramework.Forms.MetroFormBorderStyle.FixedSingle - Me.ClientSize = New System.Drawing.Size(320, 302) + Me.ClientSize = New System.Drawing.Size(320, 327) Me.ControlBox = False Me.DisplayHeader = False Me.MaximizeBox = False diff --git a/Crunchyroll Downloader/CheckBoxComboBox.vb b/Crunchyroll Downloader/CheckBoxComboBox.vb index fc31980..a6b5140 100644 --- a/Crunchyroll Downloader/CheckBoxComboBox.vb +++ b/Crunchyroll Downloader/CheckBoxComboBox.vb @@ -145,19 +145,19 @@ Public Class CheckBoxComboBox Private Sub Animation_Tick(sender As Object, e As EventArgs) Handles Animation.Tick If Me.Text = "CR Dub selection" Then - If Me.Height < 300 Then + If Me.Height < 330 Then Me.Height = Me.Height + 30 Else - Me.Height = 300 + Me.Height = 330 Animation.Enabled = False End If ElseIf Me.Text = "CR Sub selection" Then - If Me.Height < 270 Then + If Me.Height < 300 Then Me.Height = Me.Height + 30 Else - Me.Height = 270 + Me.Height = 300 Animation.Enabled = False End If diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index d104ad6..4b151a6 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1351,6 +1351,11 @@ Public Class Main If TextBox2_Text = Nothing Or TextBox2_Text = "Use Custom Name" Or CBool(InStr(TextBox2_Text, "++")) = True Then + If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then + CR_season_number = Nothing + ElseIf IgnoreSeason = 2 Then + CR_season_number = Nothing + End If If Season_Prefix = "[default season prefix]" Then If CR_episode = Nothing And CR_episode2 = Nothing Then 'no episode number means most likey a movie @@ -1370,11 +1375,6 @@ Public Class Main CR_FolderSeason = CR_season_number - If IgnoreSeason = 1 And CR_season_number = "1" Or IgnoreSeason = 1 And CR_season_number = "0" Then - CR_season_number = Nothing - ElseIf IgnoreSeason = 2 Then - CR_season_number = Nothing - End If If Episode_Prefix = "[default episode prefix]" Then diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index 9e1ab44..ae3ac0c 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -200,7 +200,7 @@ Public Class Einstellungen CB_CR_Harsubs.Items.Clear() - For i As Integer = 0 To Main.LangValueEnum.Count - 1 + For i As Integer = 0 To Main.LangValueEnum.Count - 2 CB_CR_Harsubs.Items.Add(Main.LangValueEnum(i).Name) If Main.LangValueEnum(i).CR_Value = Main.SubSprache.CR_Value Then 'MsgBox(CB_CR_Harsubs.Items.Count.ToString)