diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index a966479..6ba30ec 100644 Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide index 968e7c8..6eabdb0 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index db1fcf7..d36b09e 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal index 54eae33..3577756 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index c709c2a..0d904e9 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -148,18 +148,16 @@ Public Class GeckoFX SoftSub.DownloadSubs() Me.Close() End If - Else - If Main.UserBowser = False Then - Main.WebbrowserURL = WebBrowser1.Url.ToString - Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml - Main.WebbrowserTitle = WebBrowser1.DocumentTitle - Me.Close() - End If End If End If End If - + If Main.UserBowser = False Then + Main.WebbrowserURL = WebBrowser1.Url.ToString + Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml + Main.WebbrowserTitle = WebBrowser1.DocumentTitle + Me.Close() + End If End Sub Private Sub GeckoFX_Load(sender As Object, e As EventArgs) Handles MyBase.Load diff --git a/Crunchyroll Downloader/Main.designer.vb b/Crunchyroll Downloader/Main.designer.vb index f0f33b4..626b9a0 100644 --- a/Crunchyroll Downloader/Main.designer.vb +++ b/Crunchyroll Downloader/Main.designer.vb @@ -119,6 +119,7 @@ Partial Class Main Me.ListView1.Font = New System.Drawing.Font("Microsoft Sans Serif", 93.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ListView1.ForeColor = System.Drawing.Color.Black Me.ListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None + Me.ListView1.HideSelection = False Me.ListView1.Location = New System.Drawing.Point(1, 64) Me.ListView1.MinimumSize = New System.Drawing.Size(800, 400) Me.ListView1.Name = "ListView1" diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index 91721d5..89172c3 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -760,9 +760,12 @@ Public Class Main If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":null")) Then SubSprache2 = "null" Else - ResoNotFoundString = WebbrowserText - DialogTaskString = "Language" - Reso.ShowDialog() + Me.Invoke(New Action(Function() + ResoNotFoundString = WebbrowserText + DialogTaskString = "Language" + Reso.ShowDialog() + Return Nothing + End Function)) If UserCloseDialog = True Then Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Else @@ -789,9 +792,12 @@ Public Class Main Else - ResoNotFoundString = WebbrowserText - DialogTaskString = "Language" - Reso.ShowDialog() + Me.Invoke(New Action(Function() + ResoNotFoundString = WebbrowserText + DialogTaskString = "Language" + Reso.ShowDialog() + Return Nothing + End Function)) If UserCloseDialog = True Then Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Else @@ -912,14 +918,19 @@ Public Class Main If CBool(InStr(str, "x" + Resu.ToString + ",")) Then Resu2 = "x" + Resu.ToString Else + 'MsgBox(str) If CBool(InStr(str, ResuSave + ",")) Then Resu2 = Resu2 Else + Me.Invoke(New Action(Function() + DialogTaskString = "Resolution" + ResoNotFoundString = str + Reso.ShowDialog() + Return Nothing + End Function)) - ResoNotFoundString = str - DialogTaskString = "Resolution" - Reso.ShowDialog() - 'MsgBox(ResoBackString) + + MsgBox(ResoBackString) If UserCloseDialog = True Then Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Else diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 0511480..4987279 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/Reso.vb b/Crunchyroll Downloader/Reso.vb index 91feb67..d1d5d70 100644 --- a/Crunchyroll Downloader/Reso.vb +++ b/Crunchyroll Downloader/Reso.vb @@ -52,28 +52,21 @@ ComboBox1.Items.Add(langsplit(0)) Next SurroundingSub() - 'ComboBox1.SelectedIndex = 0 ElseIf Main.DialogTaskString = "Resolution" Then - ' CheckBox1.Visible = True StatusLabel.Text = Main.LabelResoNotFoundText - MsgBox(Main.ResoNotFoundString) - Dim Zeilen() As String = Main.ResoNotFoundString.Split(New String() {vbNewLine}, System.StringSplitOptions.RemoveEmptyEntries) - For i As Integer = 0 To Zeilen.Count - 1 - If InStr(Zeilen(i), ": Video:") Then - Dim ZeileReso() As String = Zeilen(i).Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries) - Dim ZeileReso2() As String = ZeileReso(0).Split(New String() {", "}, System.StringSplitOptions.RemoveEmptyEntries) - ComboBox1.Items.Add(ZeileReso2(ZeileReso2.Count - 1)) - End If + Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries) + For i As Integer = 1 To Reso_avaible1.Count - 1 + Dim Reso_avaible2 As String() = Reso_avaible1(i).Split(New [Char]() {Chr(44)}) + ComboBox1.Items.Add(Reso_avaible2(0)) Next - - 'Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries) - 'For i As Integer = 1 To Reso_avaible1.Count - 1 - ' Dim Reso_avaible2 As String() = Reso_avaible1(i).Split(New [Char]() {Chr(44)}) - ' ComboBox1.Items.Add(Reso_avaible2(0)) - 'Next SurroundingSub() - 'ComboBox1.SelectedIndex = 0 + Try + ComboBox1.SelectedIndex = 0 + Catch ex As Exception + End Try + End If + End Sub Private Sub SurroundingSub() @@ -107,7 +100,7 @@ End Sub Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click - If ComboBox1.SelectedText = Nothing Then + If ComboBox1.SelectedItem.ToString = Nothing Then Else Main.ResoBackString = ComboBox1.SelectedItem.ToString Main.UserCloseDialog = False diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 8d74abe..adfdf00 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb index 0041b16..c2b35fd 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.1.zip b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.1.zip new file mode 100644 index 0000000..28f4ecf Binary files /dev/null and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll-Downloader-v3.0.1.zip differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index 8d74abe..adfdf00 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb index 0041b16..c2b35fd 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache index affc7b9..8bc7be2 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 2ceb923..70bbc53 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Crunchyroll Downloader/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ