From 1ed5411644c4769051514c3dcac9540aae6af6a1 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Tue, 18 Oct 2016 17:05:30 +0300
Subject: [PATCH] Few annotate image changes

---
 ShareX/Forms/MainForm.cs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs
index d8d745784..f4a7a6704 100644
--- a/ShareX/Forms/MainForm.cs
+++ b/ShareX/Forms/MainForm.cs
@@ -721,7 +721,7 @@ private bool CheckCLIHotkey(CLICommand command)
             {
                 if (command.CheckCommand(job.ToString()))
                 {
-                    ExecuteJob(TaskSettings.GetDefaultTaskSettings(), job, command);
+                    ExecuteJob(job, command);
                     return true;
                 }
             }
@@ -1744,9 +1744,9 @@ private void HandleHotkeys(HotkeySettings hotkeySetting)
             }
         }
 
-        private void ExecuteJob(HotkeyType job)
+        private void ExecuteJob(HotkeyType job, CLICommand command = null)
         {
-            ExecuteJob(Program.DefaultTaskSettings, job);
+            ExecuteJob(Program.DefaultTaskSettings, job, command);
         }
 
         private void ExecuteJob(TaskSettings taskSettings)
@@ -1860,11 +1860,14 @@ private void ExecuteJob(TaskSettings taskSettings, HotkeyType job, CLICommand co
                     TaskHelpers.OpenScreenColorPicker(safeTaskSettings);
                     break;
                 case HotkeyType.ImageEditor:
-                    if (command != null)
-                        if (!string.IsNullOrEmpty(command.Parameter))
-                            TaskHelpers.AnnotateImage(command.Parameter);
+                    if (command != null && !string.IsNullOrEmpty(command.Parameter) && File.Exists(command.Parameter))
+                    {
+                        TaskHelpers.AnnotateImage(command.Parameter, safeTaskSettings);
+                    }
                     else
-                        TaskHelpers.AnnotateImage(taskSettings);
+                    {
+                        TaskHelpers.AnnotateImage(safeTaskSettings);
+                    }
                     break;
                 case HotkeyType.ImageEffects:
                     TaskHelpers.OpenImageEffects();