From b62733a92db4e2cb13bf701309c1befc8412a5ae Mon Sep 17 00:00:00 2001
From: JoeBroesele <56547187+JoeBroesele@users.noreply.github.com>
Date: Wed, 23 Oct 2019 12:43:30 +0200
Subject: [PATCH] Fixed Run on Windows Startup (#159)

Thanks to @JoeBroesele
---
 LibreHardwareMonitor/Resources/Web/index.html | 2 +-
 LibreHardwareMonitor/UI/MainForm.cs           | 2 +-
 LibreHardwareMonitor/UI/ShowDesktop.cs        | 2 +-
 LibreHardwareMonitor/UI/StartupManager.cs     | 5 +++--
 LibreHardwareMonitor/UI/SystemTray.cs         | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/LibreHardwareMonitor/Resources/Web/index.html b/LibreHardwareMonitor/Resources/Web/index.html
index c4be82c..34cbc65 100644
--- a/LibreHardwareMonitor/Resources/Web/index.html
+++ b/LibreHardwareMonitor/Resources/Web/index.html
@@ -6,7 +6,7 @@
 
 <html>
   <head>
-    <title>Open Hardware Monitor - Web Version</title>
+    <title>Libre Hardware Monitor - Web Version</title>
     <script type='text/javascript' src='js/jquery-1.7.2.min.js'></script>
     <script type='text/javascript' src='js/jquery.tmpl.min.js'></script>
     <script type='text/javascript' src='js/knockout-2.1.0.min.js'></script>
diff --git a/LibreHardwareMonitor/UI/MainForm.cs b/LibreHardwareMonitor/UI/MainForm.cs
index 704f028..6fc95b4 100644
--- a/LibreHardwareMonitor/UI/MainForm.cs
+++ b/LibreHardwareMonitor/UI/MainForm.cs
@@ -64,7 +64,7 @@ namespace LibreHardwareMonitor.UI
         {
             InitializeComponent();
 
-            // check if the OpenHardwareMonitorLib assembly has the correct version
+            // check if the LibreHardwareMonitorLib assembly has the correct version
             if (Assembly.GetAssembly(typeof(Computer)).GetName().Version != Assembly.GetExecutingAssembly().GetName().Version)
             {
                 MessageBox.Show("The version of the file LibreHardwareMonitorLib.dll is incompatible.",
diff --git a/LibreHardwareMonitor/UI/ShowDesktop.cs b/LibreHardwareMonitor/UI/ShowDesktop.cs
index 48338df..867e998 100644
--- a/LibreHardwareMonitor/UI/ShowDesktop.cs
+++ b/LibreHardwareMonitor/UI/ShowDesktop.cs
@@ -15,7 +15,7 @@ namespace LibreHardwareMonitor.UI
         private event ShowDesktopChangedEventHandler ShowDesktopChangedEvent;
         private readonly System.Threading.Timer _timer;
         private bool _showDesktop;
-        private readonly string _referenceWindowCaption = "OpenHardwareMonitorShowDesktopReferenceWindow";
+        private readonly string _referenceWindowCaption = "LibreHardwareMonitorShowDesktopReferenceWindow";
 
         private ShowDesktop()
         {
diff --git a/LibreHardwareMonitor/UI/StartupManager.cs b/LibreHardwareMonitor/UI/StartupManager.cs
index 67ebc09..41332c6 100644
--- a/LibreHardwareMonitor/UI/StartupManager.cs
+++ b/LibreHardwareMonitor/UI/StartupManager.cs
@@ -4,6 +4,7 @@
 // All Rights Reserved
 
 using System;
+using System.IO;
 using System.Linq;
 using System.Security;
 using System.Security.Principal;
@@ -150,8 +151,8 @@ namespace LibreHardwareMonitor.UI
 
             taskDefinition.Principal.RunLevel = TaskRunLevel.Highest;
             taskDefinition.Principal.LogonType = TaskLogonType.InteractiveToken;
-            
-            taskDefinition.Actions.Add(Application.ExecutablePath, "", Application.ExecutablePath);
+
+            taskDefinition.Actions.Add(new ExecAction(Application.ExecutablePath, "", Path.GetDirectoryName(Application.ExecutablePath)));
 
             TaskService.Instance.RootFolder.RegisterTaskDefinition(nameof(LibreHardwareMonitor), taskDefinition);
         }
diff --git a/LibreHardwareMonitor/UI/SystemTray.cs b/LibreHardwareMonitor/UI/SystemTray.cs
index 2fd1e73..0466fbf 100644
--- a/LibreHardwareMonitor/UI/SystemTray.cs
+++ b/LibreHardwareMonitor/UI/SystemTray.cs
@@ -50,7 +50,7 @@ namespace LibreHardwareMonitor.UI
                 SendHideShowCommand();
             };
             _mainIcon.Icon = EmbeddedResources.GetIcon("smallicon.ico");
-            _mainIcon.Text = "Open Hardware Monitor";
+            _mainIcon.Text = "Libre Hardware Monitor";
         }
 
         private void HardwareRemoved(IHardware hardware)