From 99791f7af433a61afcde38e81f128001ae7b09f6 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 6 May 2023 11:24:11 +0300 Subject: [PATCH] Allow overriding file extension in video converter tool --- ShareX.MediaLib/VideoConverterOptions.cs | 16 +++++++++++----- ShareX/Tools/PinToScreen/PinToScreenForm.cs | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ShareX.MediaLib/VideoConverterOptions.cs b/ShareX.MediaLib/VideoConverterOptions.cs index 67813b37a..90ad458be 100644 --- a/ShareX.MediaLib/VideoConverterOptions.cs +++ b/ShareX.MediaLib/VideoConverterOptions.cs @@ -39,14 +39,20 @@ public string OutputFilePath { get { - if (string.IsNullOrEmpty(OutputFolderPath) || string.IsNullOrEmpty(OutputFileName)) + string path = ""; + + if (!string.IsNullOrEmpty(OutputFolderPath) && !string.IsNullOrEmpty(OutputFileName)) { - return ""; + path = Path.Combine(OutputFolderPath, OutputFileName); + + if (!Path.HasExtension(OutputFileName)) + { + string extension = GetFileExtension(); + path = Path.ChangeExtension(path, extension); + } } - string path = Path.Combine(OutputFolderPath, OutputFileName); - string extension = GetFileExtension(); - return Path.ChangeExtension(path, extension); + return path; } } diff --git a/ShareX/Tools/PinToScreen/PinToScreenForm.cs b/ShareX/Tools/PinToScreen/PinToScreenForm.cs index 9a45529c7..d37abb799 100644 --- a/ShareX/Tools/PinToScreen/PinToScreenForm.cs +++ b/ShareX/Tools/PinToScreen/PinToScreenForm.cs @@ -143,6 +143,8 @@ private PinToScreenForm(PinToScreenOptions options) ImageOpacity = Options.InitialOpacity; InitializeComponent(); + // TODO: Add options form + tsbOptions.Visible = false; ShareXResources.ApplyTheme(this); TopMost = Options.TopMost; SetStyle(ControlStyles.AllPaintingInWmPaint | ControlStyles.OptimizedDoubleBuffer | ControlStyles.UserPaint, true);