From e01f8304b4d3d4d2ffa7d9977f66f39a40825aac Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 16 Jun 2020 06:23:13 +0300 Subject: [PATCH] Try catch extract --- ShareX.ImageEffectsLib/ImageEffectsForm.cs | 2 +- ShareX/Forms/MainForm.cs | 4 ++-- ShareX/TaskHelpers.cs | 17 +++++++++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs index 235264946..ddab1ae0d 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.cs +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.cs @@ -106,7 +106,7 @@ public void EditorMode() btnClose.Text = Resources.ImageEffectsForm_EditorMode_Cancel; } - public void ImportImageEffectFromFilePath(string filePath) + public void ImportImageEffectFromFile(string filePath) { eiImageEffects.ImportFile(filePath); } diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index a955002f2..857ad6617 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1056,14 +1056,14 @@ public void UseCommandLineArgs(List commands) { if (command.Command.Equals("CustomUploader", StringComparison.InvariantCultureIgnoreCase)) { - TaskHelpers.AddCustomUploader(command.Parameter); + TaskHelpers.ImportCustomUploader(command.Parameter); continue; } if (command.Command.Equals("ImageEffect", StringComparison.InvariantCultureIgnoreCase)) { - TaskHelpers.AddImageEffect(command.Parameter); + TaskHelpers.ImportImageEffect(command.Parameter); continue; } diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 57f71aab6..cd5127b98 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -1588,7 +1588,7 @@ public static Screenshot GetScreenshot(TaskSettings taskSettings = null) return screenshot; } - public static void AddCustomUploader(string filePath) + public static void ImportCustomUploader(string filePath) { if (Program.UploadersConfig != null) { @@ -1688,9 +1688,18 @@ public static void AddCustomUploader(string filePath) } } - public static void AddImageEffect(string filePath) + public static void ImportImageEffect(string filePath) { - string configFilePath = ImageEffectPackager.ExtractPackage(filePath, Program.ImageEffectsFolder); + string configFilePath = null; + + try + { + configFilePath = ImageEffectPackager.ExtractPackage(filePath, Program.ImageEffectsFolder); + } + catch (Exception ex) + { + ex.ShowError(); + } if (!string.IsNullOrEmpty(configFilePath) && File.Exists(configFilePath)) { @@ -1698,7 +1707,7 @@ public static void AddImageEffect(string filePath) if (imageEffectsForm != null) { - imageEffectsForm.ImportImageEffectFromFilePath(configFilePath); + imageEffectsForm.ImportImageEffectFromFile(configFilePath); } } }