Merge branch 'master' of https://github.com/staxrip/staxrip

Forms/MainForm.vb

@@ -3460,7 +3460,7 @@ Public Class MainForm
 
             b = ui.AddBool()
             b.Text = "Enable tooltips in menus (restart required)"
-            b.Help = "If you disable this you can still right-click menu items to show the tooltip."
+            b.Help = "Tooltips can always be shown by right-clicking menu items."
             b.Field = NameOf(s.EnableTooltips)
 
             '############# Preprocessing
@@ -3542,18 +3542,6 @@ Public Class MainForm
             b.Text = "Verify tool status"
             b.Field = NameOf(s.VerifyToolStatus)
 
-            n = ui.AddNum
-            n.Text = "Character limit for folders"
-            n.Help = "Character limit of source file folder paths. Windows does not have usable long path support."
-            n.Config = {50, 900, 10}
-            n.Field = NameOf(s.CharacterLimitFolder)
-
-            n = ui.AddNum
-            n.Text = "Character limit for filenames"
-            n.Help = "Windows does not have usable long path support."
-            n.Config = {20, 200, 10}
-            n.Field = NameOf(s.CharacterLimitFilename)
-
             ui.SelectLast("last settings page")
 
             If form.ShowDialog() = DialogResult.OK Then
@@ -4256,6 +4244,7 @@ Public Class MainForm
             b.Help = "Imports VUI metadata such as HDR from the source file to the video encoder."
             b.Field = NameOf(p.ImportVUIMetadata)
 
+            'TODO: added by Revan, needs research
             b = ui.AddBool()
             b.Text = "HDR Ingest"
             b.Help = "Adds the Remaining Metadata Required to be Compliant to HDR10 or HLG Standards"

General/ApplicationSettings.vb

@@ -11,8 +11,6 @@ Public Class ApplicationSettings
     Public AviSynthFilterPreferences As StringPairList
     Public AviSynthMode As FrameServerMode
     Public AviSynthProfiles As List(Of FilterCategory)
-    Public CharacterLimitFolder As Integer = 100
-    Public CharacterLimitFilename As Integer = 70
     Public CheckForUpdates As Boolean
     Public CheckForUpdatesBeta As Boolean
     Public CheckForUpdatesDismissed As String

General/Muxer.vb

@@ -614,7 +614,9 @@ Public Class MkvMuxer
     End Sub
 
     Sub WriteTagfile()
-        If Tags.Count = 0 Then Exit Sub
+        If Tags.Count = 0 Then
+            Exit Sub
+        End If
 
         Dim xml = <Tags>
                       <%= From tag In Tags Select

General/Package.vb

@@ -2081,7 +2081,7 @@ Public Class Package
 
                 Return HelpFile.ReadAllText
             End If
-        Catch ex As Exception
+        Catch
         End Try
 
         Return ""