diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index e848182..1914b5f 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-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index 5459713..8bb98b2 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 058a656..55a60d9 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/Main.vb b/Crunchyroll Downloader/Main.vb index 08816a1..4c43bd0 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1323,6 +1323,12 @@ Public Class Main Return "Español (España)" ElseIf HardSub = Chr(34) + "jaJP" + Chr(34) Then Return "Japanese" + ElseIf HardSub = Chr(34) + "en" + Chr(34) Then + Return "English" + ElseIf HardSub = Chr(34) + "pt" + Chr(34) Then + Return "Português (Brasil)" + ElseIf HardSub = Chr(34) + "es" + Chr(34) Then + Return "Español (LA)" Else Return CB_SuB_Nothing End If @@ -1945,25 +1951,11 @@ Public Class Main For i As Integer = 0 To ListView1.Items.Count - 1 ItemList(i).KillRunningTask() Next - - 'Try - ' tcpListener.Stop() - - 'Catch ex As Exception - 'End Try - RemoveTempFiles() Me.Close() End If Else - 'Try - - ' tcpListener.Stop() - 'Catch ex As Exception - ' MsgBox(ex.ToString) - 'End Try - Timer3.Enabled = False RemoveTempFiles() @@ -2782,12 +2774,17 @@ Public Class Main If UsedSubs.Count > 0 Then If MergeSubstoMP4 = True Then - Dim DispositionIndex As Integer + Dim DispositionIndex As Integer = 999 + Dim LastMerged As String = Nothing For i As Integer = 0 To UsedSubs.Count - 1 Dim SoftSub As String() = UsedSubs.Item(i).Split(New String() {" , "}, System.StringSplitOptions.RemoveEmptyEntries) - Debug.WriteLine(SoftSub(1)) + If CCtoMP4CC(SoftSub(1)) = LastMerged Then + Continue For + Else + LastMerged = CCtoMP4CC(SoftSub(1)) + End If If DefaultSubFunimation = SoftSub(1) Then - Debug.WriteLine(SoftSub(1)) + 'Debug.WriteLine(SoftSub(1)) DispositionIndex = i End If If SoftSubMergeURLs = Nothing Then @@ -2807,9 +2804,8 @@ Public Class Main End If Next - If DispositionIndex = Nothing Then - Else - SoftSubMergeMetatata = SoftSubMergeMetatata + " -disposition:s:" + DispositionIndex + " default" + If DispositionIndex < 999 Then + SoftSubMergeMetatata = SoftSubMergeMetatata + " -disposition:s:" + DispositionIndex.ToString + " default" End If Else For i As Integer = 0 To UsedSubs.Count - 1 diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 111423f..74c80bf 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/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 5a7db40..c6e887b 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 90ea40b..65c9b50 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/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index 5a7db40..c6e887b 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 90ea40b..65c9b50 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ