chores and cleanups (guard checks, etc)

Author: FN-FAL113

CS2ServerPicker/App.vb

@@ -131,7 +131,7 @@
             Environment.NewLine +
             "Author: FN-FAL113 (github username)" + Environment.NewLine +
             "License: GNU General Public License V3" + Environment.NewLine +
-            "App Version: 2.4.0",
+            "App Version: 2.4.1",
             "App Info"
         )
     End Sub

CS2ServerPicker/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.4.0.0")>
-<Assembly: AssemblyFileVersion("2.4.0.0")>
+<Assembly: AssemblyVersion("2.4.1.0")>
+<Assembly: AssemblyFileVersion("2.4.1.0")>
 <Assembly: NeutralResourcesLanguage("en")>

CS2ServerPicker/Services/DataGridViewService.vb

@@ -1,7 +1,5 @@
 Module DataGridViewService
 
-    ' cache server flag image to prevent unnecessary requests
-
     Public Sub Load_Server_List()
         Dim serverDict As Dictionary(Of String, String) = IIf(App.Get_Is_Clustered(), App.Get_Server_Dictionary_Clustered(), App.Get_Server_Dictionary_Unclustered)
 

CS2ServerPicker/Services/ErrorService.vb

@@ -2,7 +2,7 @@
 
 Module ErrorService
     Public Sub Log_Exception_To_File(exception As Exception, errorFrom As String)
-        File.AppendAllText(System.AppDomain.CurrentDomain.BaseDirectory + "error_" + DateTimeOffset.Now.ToUnixTimeSeconds.ToString() + ".txt",
+        File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + "error_" + DateTimeOffset.Now.ToUnixTimeSeconds.ToString() + ".txt",
                           errorFrom + Environment.NewLine + exception.Message)
     End Sub
 End Module

CS2ServerPicker/Settings.vb

@@ -13,66 +13,74 @@
     Private Sub ResetFirewallButton_Click(sender As Object, e As EventArgs) Handles ResetFirewallButton.Click
         Dim resetWindowsFirewallRes As DialogResult = MessageBox.Show("This will attempt to reset windows firewall to its default state. Confirm action?", "Reset Windows Firewall", MessageBoxButtons.YesNo, MessageBoxIcon.Warning)
 
-        If resetWindowsFirewallRes = DialogResult.Yes Then
-            Try
-                Dim proc As Process = Create_Custom_CMD_Process()
+        If resetWindowsFirewallRes = DialogResult.No Then
+            Return
+        End If
 
-                proc.StartInfo.Arguments = "/c netsh advfirewall reset"
-                proc.Start()
-                proc.WaitForExit()
+        Try
+            Dim proc As Process = Create_Custom_CMD_Process()
 
-                If proc.ExitCode = 1 Or proc.ExitCode < 0 Then
-                    Throw New Exception("Sdtout: " + proc.StandardOutput.ReadToEnd() + Environment.NewLine + "Stderr: " + proc.StandardError.ReadToEnd())
-                End If
+            proc.StartInfo.Arguments = "/c netsh advfirewall reset"
+            proc.Start()
+            proc.WaitForExit()
 
-                MessageBox.Show("Windows firewall reset successful!", "Reset Windows Firewall", MessageBoxButtons.OK, MessageBoxIcon.Information)
+            If proc.ExitCode = 1 Or proc.ExitCode < 0 Then
+                Throw New Exception("Sdtout: " + proc.StandardOutput.ReadToEnd() + Environment.NewLine + "Stderr: " + proc.StandardError.ReadToEnd())
+            End If
 
-                proc.Dispose()
-            Catch ex As Exception
-                Log_Exception_To_File(ex, "An error has occurred while resetting windows firewall!")
+            MessageBox.Show("Windows firewall reset successful!", "Reset Windows Firewall", MessageBoxButtons.OK, MessageBoxIcon.Information)
 
-                MessageBox.Show("An error has occurred while resetting windows firewall!", "Error")
-            End Try
-        End If
+            proc.Dispose()
+        Catch ex As Exception
+            Log_Exception_To_File(ex, "An error has occurred while resetting windows firewall!")
+
+            MessageBox.Show("An error has occurred while resetting windows firewall!", "Error")
+        End Try
     End Sub
 
     Private Sub CheckFirewallButton_Click(sender As Object, e As EventArgs) Handles CheckFirewallButton.Click
         Dim checkWindowsFirewallRes As DialogResult = MessageBox.Show("This will attempt to check current state of windows firewall. Confirm action?", "Check Windows Firewall", MessageBoxButtons.YesNo, MessageBoxIcon.Information)
 
-        If checkWindowsFirewallRes = DialogResult.Yes Then
-            Try
-                Dim proc As Process = Create_Custom_CMD_Process()
+        If checkWindowsFirewallRes = DialogResult.No Then
+            Return
+        End If
 
-                proc.StartInfo.Arguments = "/c netsh advfirewall show allprofiles state"
-                proc.Start()
-                proc.WaitForExit()
+        Try
+            Dim proc As Process = Create_Custom_CMD_Process()
 
-                If proc.ExitCode = 1 Or proc.ExitCode < 0 Then
-                    Throw New Exception("On firewall check" + Environment.NewLine + "StdOut: " + proc.StandardOutput.ReadToEnd() + Environment.NewLine + "StdErr: " + proc.StandardError.ReadToEnd())
-                End If
+            proc.StartInfo.Arguments = "/c netsh advfirewall show allprofiles state"
+            proc.Start()
+            proc.WaitForExit()
 
-                If proc.StandardOutput.ReadToEnd().Contains("OFF") Then
-                    Dim enableWinFirewallRes As DialogResult = MessageBox.Show("This will attempt to enable windows firewall. Confirm action?", "Enable Windows Firewall", MessageBoxButtons.YesNo, MessageBoxIcon.Information)
+            If proc.ExitCode = 1 Or proc.ExitCode < 0 Then
+                Throw New Exception("On firewall check" + Environment.NewLine + "StdOut: " + proc.StandardOutput.ReadToEnd() + Environment.NewLine + "StdErr: " + proc.StandardError.ReadToEnd())
+            End If
 
-                    proc.StartInfo.Arguments = "/c netsh advfirewall set allprofiles state on"
-                    proc.Start()
-                    proc.WaitForExit()
+            If proc.StandardOutput.ReadToEnd().Contains("OFF") Then
+                Dim enableWinFirewallRes As DialogResult = MessageBox.Show("This will attempt to enable windows firewall. Confirm action?", "Enable Windows Firewall", MessageBoxButtons.YesNo, MessageBoxIcon.Information)
 
-                    If proc.ExitCode = 1 Or proc.ExitCode < 0 Then
-                        Throw New Exception("On firewall enable" + Environment.NewLine + "StdOut: " + proc.StandardOutput.ReadToEnd() + Environment.NewLine + "StdErr: " + proc.StandardError.ReadToEnd())
-                    End If
+                If enableWinFirewallRes = DialogResult.No Then
+                    Return
+                End If
 
-                    MessageBox.Show("Windows firewall profile states successfully enabled!", "Enable Windows Firewall", MessageBoxButtons.OK, MessageBoxIcon.Information)
-                Else
-                    MessageBox.Show("Windows firewall profile states are all enabled.", "Windows Firewall Status", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                proc.StartInfo.Arguments = "/c netsh advfirewall set allprofiles state on"
+                proc.Start()
+                proc.WaitForExit()
+
+                If proc.ExitCode = 1 Or proc.ExitCode < 0 Then
+                    Throw New Exception("On firewall enable" + Environment.NewLine + "StdOut: " + proc.StandardOutput.ReadToEnd() + Environment.NewLine + "StdErr: " + proc.StandardError.ReadToEnd())
                 End If
 
-                proc.Dispose()
-            Catch ex As Exception
-                Log_Exception_To_File(ex, "An error has occurred while checking/enabling windows firewall!")
+                MessageBox.Show("Windows firewall profile states successfully enabled!", "Enable Windows Firewall", MessageBoxButtons.OK, MessageBoxIcon.Information)
+            Else
+                MessageBox.Show("Windows firewall profile states are all enabled.", "Windows Firewall Status", MessageBoxButtons.OK, MessageBoxIcon.Information)
+            End If
 
-                MessageBox.Show("An error has occurred while checking/enabling windows firewall!", "Error")
-            End Try
-        End If
+            proc.Dispose()
+        Catch ex As Exception
+            Log_Exception_To_File(ex, "An error has occurred while checking/enabling windows firewall!")
+
+            MessageBox.Show("An error has occurred while checking/enabling windows firewall!", "Error")
+        End Try
     End Sub
 End Class