EZ_Updater updated to avoid admin rights problem & custom args added …

…to ShortCute
Haruki1707 · Mar 13, 2022 · 77c3c5f · 77c3c5f
1 parent c81c404
commit 77c3c5f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/ShortCutes/Program.cs b/ShortCutes/Program.cs
@@ -12,7 +12,7 @@ namespace ShortCutes
     static class Program
     {
         [STAThread]
-        static void Main()
+        static void Main(string[] args)
         {
             if (IsUserAdministrator() == false)
             {

diff --git a/ShortCutes/Properties/AssemblyInfo.cs b/ShortCutes/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // Puede especificar todos los valores o usar los valores predeterminados de número de compilación y de revisión
 // utilizando el carácter "*", como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4")]
-[assembly: AssemblyFileVersion("1.4")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/ShortCutes/ShortCutes.csproj b/ShortCutes/ShortCutes.csproj
@@ -212,7 +212,7 @@
       <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="EZ_Updater">
-      <Version>0.5.0.3</Version>
+      <Version>0.5.3.1</Version>
     </PackageReference>
     <PackageReference Include="Fody">
       <Version>6.0.0</Version>

diff --git a/ShortCutes/ShortCutesForm.cs b/ShortCutes/ShortCutesForm.cs
@@ -80,7 +80,13 @@ public ShortCutes()
 
         private async void ShortCutes_Shown(object sender, EventArgs e)
         {
-            if (await Updater.CheckUpdateAsync("Haruki1707", "ShortCutes")) new MessageForm("", 4).ShowDialog();
+            if (await Updater.CheckUpdateAsync("Haruki1707", "ShortCutes"))
+            {
+                if (Updater.CannotWriteOnDir)
+                    MessageForm.Error(Updater.Message);
+                else
+                    new MessageForm("", 4).ShowDialog();
+            }
         }
 
         public static void Form1_UIThreadException(object sender, ThreadExceptionEventArgs t)

diff --git a/ShortCutes/UI-forms/MessageForm.cs b/ShortCutes/UI-forms/MessageForm.cs
@@ -143,13 +143,12 @@ private void UIChange(object sender, EventArgs e)
             Messagelbl.Text = Updater.Message;
             progressBar1.Value = Updater.ProgressPercentage;
 
-            switch (Updater.State)
+            switch (Updater.ShortState)
             {
-                case UpdaterState.Canceled:
-                case UpdaterState.InstallFailed:
+                case UpdaterShortState.Canceled:
                     OKbtn.Visible = true;
                     break;
-                case UpdaterState.Installed:
+                case UpdaterShortState.Installed:
                     Application.Restart();
                     break;
             }

diff --git a/ShortCutes/src/Roslyn Form Code.cs b/ShortCutes/src/Roslyn Form Code.cs
@@ -20,6 +20,7 @@ public class CuteLauncher : Form
 		private string GameName = "%GAME%";
 		private int standarHeight = %HEIGHT%;
 		private bool WaitForWindowChange = %WAITCHANGE%;
+		private static string ExtraArgs = "";
 		System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
 
 		public CuteLauncher()
@@ -110,7 +111,7 @@ private void ExecuteEmu_Tick(object sender, EventArgs e)
 			//Emulator execution
 			ShortCute.StartInfo.WorkingDirectory = "..\\";
 			ShortCute.StartInfo.FileName = "..\\" + Emulator;
-			ShortCute.StartInfo.Arguments = "%ARGUMENTS%";
+			ShortCute.StartInfo.Arguments = "%ARGUMENTS%" + ExtraArgs;
 			ShortCute.Start();
 
 			TimerSC.Interval = 100;
@@ -193,8 +194,12 @@ protected override CreateParams CreateParams
 		}
 
 		[STAThread]
-		static void Main()
+		static void Main(string[] args)
 		{
+			if (args.Length > 0)
+				foreach (string arg in args)
+					ExtraArgs += " " + arg;
+
 			Application.EnableVisualStyles();
 			Application.Run(new CuteLauncher());
 		}