1.3.1 - Alert only shows when pressing the button.

The ShareX error alert only pops up when you press the function.
reedhaffner · Sep 27, 2019 · 924664d · 924664d
1 parent b609fbd
commit 924664d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/ShareX/Program.cs b/ShareX/Program.cs
@@ -82,9 +82,8 @@ static void Main(string[] args)
             // Alert user that ShareX was unable to be found.
             else
             {
-                MessageBox.Show("Unable to find ShareX. Please try running ShareX first, then starting StreamDeck.", "Error in ShareX4StreamDeck", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Globals.xpath = null;
             }
-
             SDWrapper.Run(args);
         }
     }

diff --git a/ShareX/ScreenRecord.cs b/ShareX/ScreenRecord.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows;
+using System.Windows.Forms;
 using WindowsInput;
 
 namespace ShareX
@@ -56,6 +56,13 @@ public ScreenRecord(SDConnection connection, InitialPayload payload) : base(conn
         public override void KeyPressed(KeyPayload payload)
         {
             Logger.Instance.LogMessage(TracingLevel.INFO, "Key Pressed");
+
+            if (Globals.xpath == null)
+            {
+                MessageBox.Show("Unable to find ShareX. Please try running ShareX first, then starting StreamDeck.", "Error in ShareX4StreamDeck", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
             if (inputRunning)
             {
                 return;

diff --git a/ShareX/Screenshot.cs b/ShareX/Screenshot.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows;
+using System.Windows.Forms;
 using WindowsInput;
 
 namespace ShareX
@@ -56,6 +56,12 @@ public Screenshot(SDConnection connection, InitialPayload payload) : base(connec
         public override void KeyPressed(KeyPayload payload)
         {
             Logger.Instance.LogMessage(TracingLevel.INFO, "Key Pressed");
+
+            if (Globals.xpath == null)
+            {
+                MessageBox.Show("Unable to find ShareX. Please try running ShareX first, then starting StreamDeck.", "Error in ShareX4StreamDeck", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
             if (inputRunning)
             {
                 return;

diff --git a/ShareX/Workflow.cs b/ShareX/Workflow.cs
@@ -7,7 +7,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using System.Windows;
+using System.Windows.Forms;
 using WindowsInput;
 
 namespace ShareX
@@ -56,6 +56,12 @@ public Workflow(SDConnection connection, InitialPayload payload) : base(connecti
         public override void KeyPressed(KeyPayload payload)
         {
             Logger.Instance.LogMessage(TracingLevel.INFO, "Key Pressed");
+            if (Globals.xpath == null)
+            {
+                MessageBox.Show("Unable to find ShareX. Please try running ShareX first, then starting StreamDeck.", "Error in ShareX4StreamDeck", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
             if (inputRunning)
             {
                 return;

diff --git a/ShareX/manifest.json b/ShareX/manifest.json
@@ -51,7 +51,7 @@
   "Name": "ShareX",
   "Icon": "Images/pluginIcon",
   "URL": "https://reedhaffner.com/",
-  "Version": "1.3",
+  "Version": "1.3.1",
   "CodePath": "com.reedhaffner.sharex",
   "Category": "ShareX",
   "CategoryIcon": "Images/categoryIcon",