[MWB]Work without service if service doesn't start (#26521)

microsoft · May 31, 2023 · 0f04180 · 0f04180
1 parent f6a91dd
commit 0f04180
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/modules/MouseWithoutBorders/App/Class/Program.cs b/src/modules/MouseWithoutBorders/App/Class/Program.cs
@@ -86,15 +86,25 @@ private static void Main()
 
                 // If we're started from the .dll module or from the service process, we should
                 // assume the service mode.
-                if (serviceMode || runningAsSystem)
+                if (serviceMode && !runningAsSystem)
                 {
-                    if (!runningAsSystem)
+                    try
                     {
                         var sc = new ServiceController(ServiceName);
                         sc.Start();
                         return;
                     }
+                    catch (Exception ex)
+                    {
+                        Common.Log("Couldn't start the service. Will try to continue as not a service.");
+                        Common.Log(ex);
+                        serviceMode = false;
+                        Setting.Values.UseService = false;
+                    }
+                }
 
+                if (serviceMode || runningAsSystem)
+                {
                     if (args.Length > 2)
                     {
                         Helper.UserLocalAppDataPath = args[2].Trim();

diff --git a/src/modules/MouseWithoutBorders/App/Class/Setting.cs b/src/modules/MouseWithoutBorders/App/Class/Setting.cs
@@ -979,6 +979,30 @@ internal bool ShowOriginalUI
             }
         }
 
+        // If starting the service fails, work in not service mode.
+        internal bool UseService
+        {
+            get
+            {
+                lock (_loadingSettingsLock)
+                {
+                    return _properties.UseService;
+                }
+            }
+
+            set
+            {
+                lock (_loadingSettingsLock)
+                {
+                    _properties.UseService = value;
+                    if (!PauseInstantSaving)
+                    {
+                        SaveSettings();
+                    }
+                }
+            }
+        }
+
         internal bool SendErrorLogV2
         {
             get