Try to run as admin if we don't have access to update CM

OSX/Info.plist

@@ -6,7 +6,7 @@
     <key>CFBundleIdentifier</key>
     <string>at.topc.cm.launcher</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.13</string>
+    <string>1.14</string>
     <key>CFBundleVersion</key>
     <string>1</string>
     <key>LSMinimumSystemVersion</key>

Shared/Config.cs

@@ -1,6 +1,6 @@
 public static class Config
 {
-    public const int APP_VERSION = 13;
+    public const int APP_VERSION = 14;
     public const int PATCH_SKIP_LIMIT = 12;
     public const string CDN_URL = "https://cm.topc.at";
 }

Windows/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.13.0.0")]
-[assembly: AssemblyFileVersion("1.13.0.0")]
+[assembly: AssemblyVersion("1.14.0.0")]
+[assembly: AssemblyFileVersion("1.14.0.0")]

Windows/src/Program.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Text;
@@ -68,27 +69,40 @@ private static void Main(string[] args)
         {
             using (SentrySdk.Init("https://76dcf1f2484f4839a78b3713420b5147@o462013.ingest.sentry.io/5556322"))
             {
-                using (new Mutex(true, "CMLauncher", out var createdNew))
+                var identity = WindowsIdentity.GetCurrent();
+                SentrySdk.ConfigureScope(scope =>
                 {
-                    if (!createdNew) return;
+                    scope.User = new User
+                    {
+                        Username = identity.Name
+                    };
+                });
 
-                    var identity = WindowsIdentity.GetCurrent();
-                    SentrySdk.ConfigureScope(scope =>
+                var isAdmin = WindowsSpecific.IsAdministrator();
+                if (isAdmin)
+                {
+                    LaunchApp(args, true);
+                }
+                else
+                {
+                    using (new Mutex(true, "CMLauncher", out var createdNew))
                     {
-                        scope.User = new User
-                        {
-                            Username = identity.Name
-                        };
-                    });
+                        if (!createdNew) return;
 
-                    SetCurrentProcessExplicitAppUserModelID(CmExeName);
-                    UpdatePinnedTaskBarElements();
+                        SetCurrentProcessExplicitAppUserModelID(CmExeName);
+                        UpdatePinnedTaskBarElements();
 
-                    Application.EnableVisualStyles();
-                    Application.SetCompatibleTextRenderingDefault(false);
-                    Application.Run(new Updater(args));
+                        LaunchApp(args, false);
+                    }
                 }
             }
         }
+
+        private static void LaunchApp(string[] args, bool isAdmin)
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new Updater(args, isAdmin));
+        }
     }
 }

Windows/src/Updater.cs

@@ -10,11 +10,17 @@ public partial class Updater : Form
         private readonly SynchronizationContext synchronizationContext;
         public static FormWindowState OriginalWindowState;
 
-        private static bool FilesLocked(IPlatformSpecific specific)
+        private static bool FilesLocked(IPlatformSpecific specific, bool isAdmin)
         {
-            var file = Path.Combine(specific.GetDownloadFolder(), "chromapper", "ChroMapper.exe");
+            var folder = Path.Combine(specific.GetDownloadFolder(), "chromapper");
+            var file = Path.Combine(folder, "ChroMapper.exe");
             try
             {
+                if (!File.Exists(folder))
+                {
+                    Directory.CreateDirectory(folder);
+                }
+
                 if (File.Exists(file))
                 {
                     using (var stream = new FileStream(file, FileMode.Open, FileAccess.Write, FileShare.None))
@@ -23,8 +29,9 @@ private static bool FilesLocked(IPlatformSpecific specific)
                     }
                 }
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                if (isAdmin) MessageBox.Show(e.Message);
                 return true;
             }
 
@@ -38,21 +45,22 @@ protected override void OnLoad(EventArgs e)
             base.OnLoad(e);
         }
 
-        public Updater(string[] args)
+        public Updater(string[] args, bool isAdmin)
         {
             InitializeComponent();
             synchronizationContext = SynchronizationContext.Current;
 
             var specific = new WindowsSpecific(this, args);
-            int tries = 0;
-            while (tries++ < 3)
+
+            if (!FilesLocked(specific, isAdmin))
             {
-                if (!FilesLocked(specific))
-                {
-                    new Main(specific);
-                    return;
-                }
-                Thread.Sleep(1000 * tries);
+                new Main(specific);
+                return;
+            }
+
+            if (!isAdmin)
+            {
+                specific.StartAsAdmin();
             }
 
             new Thread(() =>

Windows/src/WindowsSpecific.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Security.Principal;
 using System.Windows.Forms;
 using CM_Launcher;
 using SimpleJSON;
@@ -75,6 +76,13 @@ public void UpdateProgress(float progress)
 
     public void Exit()
     {
+        // Don't run CM as admin, return to unprivileged
+        if (IsAdministrator())
+        {
+            Application.Exit();
+            return;
+        }
+
         var cmWindowStyle = ProcessWindowStyle.Normal;
         if (Updater.OriginalWindowState == FormWindowState.Maximized)
         {
@@ -110,6 +118,7 @@ public void Restart(string tmpFile)
         // Run us
         var startInfo = new ProcessStartInfo(AppDomain.CurrentDomain.FriendlyName)
         {
+            Arguments = string.Join(" ", _args),
             WorkingDirectory = GetDownloadFolder()
         };
 
@@ -118,6 +127,29 @@ public void Restart(string tmpFile)
         Application.Exit();
     }
 
+    public static bool IsAdministrator()
+    {
+        var identity = WindowsIdentity.GetCurrent();
+        var principal = new WindowsPrincipal(identity);
+        return principal.IsInRole(WindowsBuiltInRole.Administrator);
+    }
+
+    public void StartAsAdmin()
+    {
+        var startInfo = new ProcessStartInfo(AppDomain.CurrentDomain.FriendlyName)
+        {
+            WorkingDirectory = GetDownloadFolder(),
+            UseShellExecute = true,
+            Verb = "runas"
+        };
+
+        var process = Process.Start(startInfo);
+        if (process == null) return;
+
+        process.WaitForExit();
+        process.Close();
+    }
+
     public void CleanupUpdate()
     {
         try