Fixed the issue with the launcher trying to connect indefinetly to a …

…lost pub serv. Bella ciao ->1.0.2.1
ENSL · Nov 4, 2018 · 3428a69 · 3428a69
1 parent 01d2266
commit 3428a69
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/NaturalLauncher/Launcher.cs b/NaturalLauncher/Launcher.cs
@@ -275,16 +275,21 @@ public static void AddToIgnoreList()
 
         internal static void UpdatePubServ(out int publicPlayers, out int maxPlayers)
         {
+
             // TO BE CONTINUED but so far we can retrieve pub serv info... 
-            string serverIP = "104.156.251.121"; //public us
-            int port = 27015;
-            IPEndPoint remoteEP = new IPEndPoint(IPAddress.Parse(serverIP), port);
-
-            var ServInfo = new ServerChecker.A2S_INFO(remoteEP);
-
-            publicPlayers = ServInfo.Players; //out
-            maxPlayers = ServInfo.MaxPlayers; //out
-            // Check for the launcher to self update
+            /*
+                string serverIP = "104.156.251.121"; //public us
+                int port = 27015;
+                IPEndPoint remoteEP = new IPEndPoint(IPAddress.Parse(serverIP), port);
+
+                var ServInfo = new ServerChecker.A2S_INFO(remoteEP);
+
+                publicPlayers = ServInfo.Players; //out
+                maxPlayers = ServInfo.MaxPlayers; //out
+                                                  // Check for the launcher to self update
+            */ //shit get stuck at trying to connect with the ip.
+                publicPlayers = 0;
+                maxPlayers = 0;
         }
     }
 }
diff --git a/NaturalLauncher/MainWindow.xaml b/NaturalLauncher/MainWindow.xaml
@@ -64,8 +64,8 @@
                 <ImageBrush ImageSource="Ressources/pauseimage.png" Stretch="Uniform"/>
             </Button.Background>
         </Button>
-        <Image Grid.Column="2" Margin="9,20,0,0" Source="Ressources/steam_icon.png" Stretch="Fill" Height="22" VerticalAlignment="Top" HorizontalAlignment="Left" Width="31"/>
-        <Label x:Name="ServInfoLabel" Content="Public Server :" Grid.Column="2" HorizontalAlignment="Left" Margin="44,18,0,0" VerticalAlignment="Top" Foreground="White" FontFamily="Segoe WP Black" Width="224">
+        <Image Grid.Column="2" Margin="9,20,0,0" Source="Ressources/steam_icon.png" Stretch="Fill" Height="22" VerticalAlignment="Top" HorizontalAlignment="Left" Width="31" Visibility="Hidden"/>
+        <Label x:Name="ServInfoLabel" Content="Public Server :" Grid.Column="2" HorizontalAlignment="Left" Margin="44,18,0,0" VerticalAlignment="Top" Foreground="White" FontFamily="Segoe WP Black" Width="224" Visibility="Hidden">
             <Label.ContextMenu>
                 <ContextMenu>
                     <MenuItem Header="Join the server" Click="JoinPublicServer"/>

diff --git a/NaturalLauncher/MainWindow.xaml.cs b/NaturalLauncher/MainWindow.xaml.cs
@@ -89,7 +89,7 @@ public MainWindow()
 
             if (SelfUpdater.LaucherRemoteVNumber != SelfUpdater.LaucherLocalVNumber && SelfUpdater.isSelfUpdating)
             {
-                this.Hide();
+                Hide();
             }
             else
             {

diff --git a/NaturalLauncher/NaturalLauncher.csproj b/NaturalLauncher/NaturalLauncher.csproj
@@ -111,6 +111,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="ConsoleManager.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="LauncherManifest.cs" />
     <Compile Include="ManifestBuilder.cs" />
     <Compile Include="ProjectSettings.cs" />