Fix FSUIPC AutoStart with only Run

Author: Fragtality

Installer/AppPackage.zip

@@ -26,7 +26,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>0.4.0.0</ApplicationVersion>
+    <ApplicationVersion>0.4.1.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

Installer/Installer.csproj

@@ -58,22 +58,56 @@ public static bool AutoStartFsuipc()
                     }
                     else
                     {
-                        string pattern = @"^RunIf(\d+).*WorkingTitle2GSX\.exe";
-                        if (Regex.IsMatch(fileContent, pattern, RegexOptions.Compiled | RegexOptions.Multiline))
+                        RegexOptions regOptions = RegexOptions.Compiled | RegexOptions.Multiline;
+                        var runMatches = Regex.Matches(fileContent, @"[;]{0,1}Run(\d+).*", regOptions);
+                        int lastRun = 0;
+                        if (runMatches.Count > 0 && runMatches[runMatches.Count - 1].Groups.Count == 2)
+                            lastRun = Convert.ToInt32(runMatches[runMatches.Count - 1].Groups[1].Value);
+
+                        var runIfMatches = Regex.Matches(fileContent, @"[;]{0,1}RunIf(\d+).*", regOptions);
+                        int lastRunIf = 0;
+                        if (runIfMatches.Count > 0 && runIfMatches[runIfMatches.Count - 1].Groups.Count == 2)
+                            lastRunIf = Convert.ToInt32(runIfMatches[runIfMatches.Count - 1].Groups[1].Value);
+
+                        if (Regex.IsMatch(fileContent, @"^[;]{0,1}Run(\d+).*WorkingTitle2GSX\.exe", regOptions))
                         {
-                            fileContent = Regex.Replace(fileContent, pattern, $"RunIf$1={programParam},KILL,{Parameters.binPath}", RegexOptions.Compiled | RegexOptions.Multiline);
+                            fileContent = Regex.Replace(fileContent, @"^[;]{0,1}Run(\d+).*WorkingTitle2GSX\.exe", $"RunIf{lastRunIf + 1}={programParam},KILL,{Parameters.binPath}", regOptions);
                             File.WriteAllText(regPath, fileContent, Encoding.Default);
                             result = true;
                         }
-                        else
+                        else if (Regex.IsMatch(fileContent, @"^[;]{0,1}RunIf(\d+).*WorkingTitle2GSX\.exe", regOptions))
                         {
-                            int posLastRunBegin = fileContent.LastIndexOf("RunIf");
-                            int posLastRunEnd = fileContent.IndexOf('\n', posLastRunBegin);
-                            int lastIndex = Convert.ToInt32(fileContent.Substring(posLastRunBegin + 5, 1));
-                            fileContent = fileContent.Insert(posLastRunEnd + 1, $"RunIf{lastIndex + 1}={programParam},KILL,{Parameters.binPath}\r\n");
+                            fileContent = Regex.Replace(fileContent, @"^[;]{0,1}RunIf(\d+).*WorkingTitle2GSX\.exe", $"RunIf$1={programParam},KILL,{Parameters.binPath}", regOptions);
                             File.WriteAllText(regPath, fileContent, Encoding.Default);
                             result = true;
                         }
+                        else
+                        {
+                            int index = -1;
+                            if (runIfMatches.Count > 0 && runMatches.Count > 0)
+                            {
+                                index = runIfMatches[runIfMatches.Count - 1].Index + runIfMatches[runIfMatches.Count - 1].Length;
+                                if (runMatches[runMatches.Count - 1].Index > runIfMatches[runIfMatches.Count - 1].Index)
+                                    index = runMatches[runMatches.Count - 1].Index + runMatches[runMatches.Count - 1].Length;
+                            }
+                            else if (runIfMatches.Count > 0)
+                                index = runIfMatches[runIfMatches.Count - 1].Index + runIfMatches[runIfMatches.Count - 1].Length;
+                            else if (runMatches.Count > 0)
+                                index = runMatches[runMatches.Count - 1].Index + runMatches[runMatches.Count - 1].Length;
+
+                            if (index > 0)
+                            {
+                                fileContent = fileContent.Insert(index + 1, $"RunIf{lastRunIf + 1}={programParam},KILL,{Parameters.binPath}\r\n");
+                                File.WriteAllText(regPath, fileContent, Encoding.Default);
+                                result = true;
+                            }
+                            else
+                            {
+                                fileContent = Regex.Replace(fileContent, @"^\[Programs\]\r\n", $"[Programs]\r\nRunIf{lastRunIf + 1}={programParam},KILL,{Parameters.binPath}\r\n", regOptions);
+                                File.WriteAllText(regPath, fileContent, Encoding.Default);
+                                result = true;
+                            }
+                        }
                     }
                 }
             }

Installer/InstallerFunctions.cs

@@ -49,5 +49,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.4.1.0")]
+[assembly: AssemblyFileVersion("0.4.1.0")]

Installer/Properties/AssemblyInfo.cs

@@ -14,7 +14,7 @@
     <PackageIcon>logo.png</PackageIcon>
     <RepositoryUrl>https://github.com/Fragtality/WorkingTitle2GSX</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Fragtality/WorkingTitle2GSX</PackageProjectUrl>
-    <Version>0.4.0</Version>
+    <Version>0.4.1</Version>
     <StartupObject>WorkingTitle2GSX.App</StartupObject>
   </PropertyGroup>