diff --git a/LibSidWiz/LibSidWiz.csproj b/LibSidWiz/LibSidWiz.csproj index f5d1fca..e88430f 100644 --- a/LibSidWiz/LibSidWiz.csproj +++ b/LibSidWiz/LibSidWiz.csproj @@ -9,9 +9,10 @@ Properties LibSidWiz LibSidWiz - v4.6.1 + v4.8 512 true + true diff --git a/LibSidWiz/Outputs/FfmpegOutput.cs b/LibSidWiz/Outputs/FfmpegOutput.cs index c9f1ba1..e7cb191 100644 --- a/LibSidWiz/Outputs/FfmpegOutput.cs +++ b/LibSidWiz/Outputs/FfmpegOutput.cs @@ -33,8 +33,16 @@ public FfmpegOutput(string pathToExe, string filename, int width, int height, in Console.WriteLine($"Starting FFMPEG: {pathToExe} {arguments}"); - // We don't want a BOM to be injected if the system code page is set to UTF-8 - Console.InputEncoding = Encoding.ASCII; + // We don't want a BOM to be injected if the system code page is set to UTF-8. + // This fails sometimes, so we swallow the error... + try + { + Console.InputEncoding = Encoding.ASCII; + } + catch (Exception e) + { + Console.WriteLine($"Failed to change console encoding to ASCII. You may get video corruption. Exception said: {e.Message}"); + } // Start it up _process = Process.Start( diff --git a/SidWiz/Properties/Resources.Designer.cs b/SidWiz/Properties/Resources.Designer.cs index 6f38f34..efc968f 100644 --- a/SidWiz/Properties/Resources.Designer.cs +++ b/SidWiz/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SidWizPlusGUI.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/SidWiz/SidWizPlusGUI.csproj b/SidWiz/SidWizPlusGUI.csproj index 08f8887..676bf26 100644 --- a/SidWiz/SidWizPlusGUI.csproj +++ b/SidWiz/SidWizPlusGUI.csproj @@ -10,7 +10,7 @@ Properties SidWizPlusGUI SidWizPlusGUI - v4.6.1 + v4.8 512 diff --git a/SidWiz/app.config b/SidWiz/app.config index 6a7e34c..6aaea8c 100644 --- a/SidWiz/app.config +++ b/SidWiz/app.config @@ -1,12 +1,11 @@ - - + - + - + diff --git a/SidWizPlus/App.config b/SidWizPlus/App.config index de27714..5ffd8f8 100644 --- a/SidWizPlus/App.config +++ b/SidWizPlus/App.config @@ -1,6 +1,6 @@ - + diff --git a/SidWizPlus/Properties/Resources.Designer.cs b/SidWizPlus/Properties/Resources.Designer.cs index 90b3ae6..ebbc91c 100644 --- a/SidWizPlus/Properties/Resources.Designer.cs +++ b/SidWizPlus/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace SidWizPlus.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/SidWizPlus/SidWizPlus.csproj b/SidWizPlus/SidWizPlus.csproj index ce40bf9..7a774a2 100644 --- a/SidWizPlus/SidWizPlus.csproj +++ b/SidWizPlus/SidWizPlus.csproj @@ -8,7 +8,7 @@ Exe SidWizPlus SidWizPlus - v4.7.2 + v4.8 512 true true