Merge branch 'main' of https://github.com/Narua2010/AmongUsModUpdater …

…into UIStuff
Narua2010 · Apr 17, 2021 · 59bf98e · 59bf98e
2 parents e23619f + 56849c5
commit 59bf98e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,4 +22,4 @@ source/GuiVersion/obj/Release/net5.0-windows/AmongUsModUpdater.csprojAssemblyRef
 /source/GuiVersion/AmongUsModUpdater.ModFunctions/obj/
 /source/GuiVersion/AmongUsModUpdater.TheOtherRoles/obj/
 /source/GuiVersion/WinForms.Logger/obj/
-
+source/GuiVersion/AmongUsModUpdater/Properties/PublishProfiles/
diff --git a/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj.user b/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>D:\Github\AmongUsModUpdater\source\GuiVersion\Properties\PublishProfiles\ClickOnceProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>D:\AmongUsModUpdater\source\GuiVersion\AmongUsModUpdater\Properties\PublishProfiles\ClickOnceProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="CustomForms\CustomButton\CustomButton.cs">

diff --git a/source/GuiVersion/AmongUsModUpdater/MainWindow.cs b/source/GuiVersion/AmongUsModUpdater/MainWindow.cs
@@ -54,18 +54,24 @@ public CustomTextBox.CustomTextBox SettingsGamePathTextBox
         public MainWindow()
         {
             InitializeComponent();
+            initializeMainWindow();
+        }
+
+        private async void initializeMainWindow()
+        {
+
             Logger.Log("Init", null);
 
             //Demo
             selectedMod = "The Other Roles";
 
-            menuPanels = new [] { panelHome, panelSettings, panelHelp};
+            menuPanels = new[] { panelHome, panelSettings, panelHelp };
             menuButtons = new[] { homeButton, settingsButton, helpButton };
 
             labelVersion.Text = "Among Us Mod Updater Version: " + Application.ProductVersion;
             settingsGamePathTextBox.Text = Properties.Settings.Default.GamePath;
 
-            newVersionUrl = AmongUsModUpdater.AmongUsModUpdater.checkVersionsUpdate(this).ToString();
+            newVersionUrl = await AmongUsModUpdater.AmongUsModUpdater.checkVersionsUpdate(this);
 
             if (Properties.Settings.Default.Backup == true)
             {

diff --git a/source/GuiVersion/AmongUsModUpdater/Properties/PublishProfiles/ClickOnceProfile.pubxml b/source/GuiVersion/AmongUsModUpdater/Properties/PublishProfiles/ClickOnceProfile.pubxml
diff --git a/source/GuiVersion/AmongUsModUpdater/Properties/PublishProfiles/ClickOnceProfile.pubxml.user b/source/GuiVersion/AmongUsModUpdater/Properties/PublishProfiles/ClickOnceProfile.pubxml.user