Few hotfixes because SteamCMD is being SteamCMD

Foxlider · Jul 28, 2021 · 823a915 · 823a915
1 parent 17d94b4
commit 823a915
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/FASTER/FASTER.csproj b/FASTER/FASTER.csproj
@@ -7,7 +7,7 @@
     <PublishReadyToRun>true</PublishReadyToRun>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <UseWPF>true</UseWPF>
-    <Version>1.7.2.103</Version>
+    <Version>1.7.2.105</Version>
     <Authors>Keelah Fox</Authors>
     <Company>FoxliCorp.</Company>
     <Description>Fox's Arma Server Tool Extended Rewrite</Description>

diff --git a/FASTER/Views/SteamUpdater.xaml b/FASTER/Views/SteamUpdater.xaml
@@ -137,8 +137,8 @@
                         </Style>
                     </RichTextBox.Resources>
                 </RichTextBox>
-                <ProgressBar Name="ISteamProgressBar" Grid.Row="2" Grid.Column="0" Margin="10,10,10,10" Height="32"/>
-                <Button Name="ISteamCancelButton" Grid.Row="2" VerticalAlignment="Stretch" Grid.Column="1" Content="Cancel" Margin="0,10,10,10" IsEnabled="False" Click="ISteamCancelButton_Click" Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0"/>
+                <mah:MetroProgressBar Name="ISteamProgressBar" Grid.Row="2" Grid.Column="0" Margin="10,10,10,10" Height="32"/>
+                <Button Name="ISteamCancelButton" Grid.Row="2" VerticalAlignment="Stretch" Grid.Column="1"  Content="Cancel" Margin="0,10,10,10" IsEnabled="False" Click="ISteamCancelButton_Click" Style="{StaticResource MahApps.Styles.Button.MetroSquare.Accent}" BorderThickness="0"/>
             </Grid>
         </Grid>
         <simpleChildWindow:ChildWindow

diff --git a/FASTER/Views/SteamUpdater.xaml.cs b/FASTER/Views/SteamUpdater.xaml.cs
@@ -206,7 +206,8 @@ public async Task RunSteamCommand(string steamCmd, string steamCommand, string t
 
                 var tasks = new List<Task>();
 
-                ISteamProgressBar.IsIndeterminate = true;
+                //ISteamProgressBar.IsIndeterminate = true;
+                ISteamProgressBar.Value = 1;
 
                 switch (type)
                 {
@@ -401,8 +402,10 @@ private void UpdateTextBox(string text)
                     while (_localRunThread && threadSlept < 10000);
                     if (_localRunThread)
                     { 
-                        Dispatcher?.Invoke(() => 
+                        Dispatcher?.Invoke(() =>
                         {
+                            if (ISteamGuardDialog.IsOpen) 
+                                return;
                             ISteamGuardDialog.Visibility = Visibility.Visible;
                             ISteamGuardDialog.IsOpen = true; 
                         }); 
@@ -411,7 +414,24 @@ private void UpdateTextBox(string text)
                 t.Start();
             }
 
-            if (text.Contains("Logged in OK"))
+            if (text.StartsWith("password:"))
+            {
+                Dispatcher?.Invoke(() =>
+                {
+                    MetroWindow.DisplayMessage("You need to enter your password.");
+                });
+            }
+
+            if (text.Contains("Enter the current code from "))
+            {
+                Dispatcher?.Invoke(() =>
+                {
+                    ISteamGuardDialog.Visibility = Visibility.Visible;
+                    ISteamGuardDialog.IsOpen     = true;
+                }); 
+            }
+
+            if (text.Contains("Logged in OK") || text.Contains("Waiting for user info..."))
             {
                 lock (_runLogLock)
                 { _runLog = false; }