diff --git a/AutoTrackR2/App.xaml.cs b/AutoTrackR2/App.xaml.cs index 85786d2..2bd9660 100644 --- a/AutoTrackR2/App.xaml.cs +++ b/AutoTrackR2/App.xaml.cs @@ -10,5 +10,4 @@ namespace AutoTrackR2 public partial class App : Application { } - } diff --git a/AutoTrackR2/HomePage.xaml.cs b/AutoTrackR2/HomePage.xaml.cs index 9ef801c..3ea74e8 100644 --- a/AutoTrackR2/HomePage.xaml.cs +++ b/AutoTrackR2/HomePage.xaml.cs @@ -59,8 +59,9 @@ namespace AutoTrackR2 } } - private void StartButton_Click(object sender, RoutedEventArgs e) + public void StartButton_Click(object sender, RoutedEventArgs e) { + UpdateButtonState(true); string scriptPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "KillTrackR_MainScript.ps1"); TailFileAsync(scriptPath); } diff --git a/AutoTrackR2/KillTrackR_MainScript.ps1 b/AutoTrackR2/KillTrackR_MainScript.ps1 index 35fe485..7bccd7d 100644 --- a/AutoTrackR2/KillTrackR_MainScript.ps1 +++ b/AutoTrackR2/KillTrackR_MainScript.ps1 @@ -1,4 +1,4 @@ -$TrackRver = "2.0r" +$TrackRver = "2.03" # Path to the config file $appName = "AutoTrackR2" diff --git a/AutoTrackR2/MainWindow.xaml.cs b/AutoTrackR2/MainWindow.xaml.cs index 1d828d0..0a982c1 100644 --- a/AutoTrackR2/MainWindow.xaml.cs +++ b/AutoTrackR2/MainWindow.xaml.cs @@ -49,6 +49,18 @@ namespace AutoTrackR2 InitializeConfigPage(); UpdateTabVisuals(); + + Loaded += MainWindow_Loaded; // Handle Loaded event + } + + private void MainWindow_Loaded(object sender, RoutedEventArgs e) + { + // Check command-line arguments after the window is loaded + var args = Environment.GetCommandLineArgs(); + if (args.Contains("-start", StringComparer.OrdinalIgnoreCase)) + { + homePage.StartButton_Click(null, null); + } } private void CloseWindow(object sender, RoutedEventArgs e) diff --git a/AutoTrackR2/UpdatePage.xaml.cs b/AutoTrackR2/UpdatePage.xaml.cs index b085d80..9962dd2 100644 --- a/AutoTrackR2/UpdatePage.xaml.cs +++ b/AutoTrackR2/UpdatePage.xaml.cs @@ -9,7 +9,7 @@ namespace AutoTrackR2 { public partial class UpdatePage : UserControl { - private string currentVersion = "v2.0-release"; + private string currentVersion = "v2.03-release"; private string latestVersion; public UpdatePage() diff --git a/AutoTrackR2_Setup/AutoTrackR2_Setup.vdproj b/AutoTrackR2_Setup/AutoTrackR2_Setup.vdproj index d54d1bd..c639ecc 100644 --- a/AutoTrackR2_Setup/AutoTrackR2_Setup.vdproj +++ b/AutoTrackR2_Setup/AutoTrackR2_Setup.vdproj @@ -198,15 +198,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:AutoTrackR2_Setup" - "ProductCode" = "8:{288819A9-947F-47BE-900E-205C7D7EAAF7}" - "PackageCode" = "8:{94C078B7-DD3E-4091-9F5E-780DE3481E1C}" + "ProductCode" = "8:{0CEA0E54-DACE-4708-81F4-F059C2555A2F}" + "PackageCode" = "8:{59DD7243-3BBF-4686-8388-51BFB8782FA2}" "UpgradeCode" = "8:{0B78A147-D0DE-4F72-8906-A62611787CA7}" "AspNetVersion" = "8:" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:FALSE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:2.0.2" + "ProductVersion" = "8:2.0.3" "Manufacturer" = "8:GrieferNET" "ARPHELPTELEPHONE" = "8:" "ARPHELPLINK" = "8:discord.gg/griefernet"