From 0c7a9ca9c95029a13731120c9bdf4f030e1f3df5 Mon Sep 17 00:00:00 2001
From: Nate Book <nmbook@gmail.com>
Date: Fri, 30 Oct 2020 23:17:47 -0400
Subject: [PATCH] Fix BNET server host not being set when using BNLS server
 finder (default)

Merges:
Update link to Scroll Wheel Fix to archive.org

Because Microsoft hates keeping old documents available.
---
 README.md         |  2 +-
 trunk/frmChat.frm | 28 ++++++++++++----------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index a7f23900..fe8c4310 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,6 @@ You'll need Microsoft Visual Basic 6.0.
 
 ##### Visual Basic 6 Scroll Wheel Fix
 The Visual Basic 6 IDE does not have built-in support for scrolling by using the mouse wheel.
-To fix this, you need to download and follow instructions from [this KB article](https://support.microsoft.com/en-us/kb/837910).
+To fix this, you need to download and follow instructions from [this KB article](https://web.archive.org/web/20150312195640/https://support.microsoft.com/en-us/kb/837910).
 
 If you are on 64-bit Windows, you will need to use the 32-bit version of regsvr32, located in `%systemroot%\SysWoW64\` (see [this KB article](https://support.microsoft.com/en-us/kb/249873)).
diff --git a/trunk/frmChat.frm b/trunk/frmChat.frm
index e1d39caa..e354c08d 100644
--- a/trunk/frmChat.frm
+++ b/trunk/frmChat.frm
@@ -6530,20 +6530,6 @@ Sub Connect()
 
         AddChat g_Color.InformationText, "Connecting your bot..."
         
-        If BotVars.BNLS Then
-            If Len(BotVars.BNLSServer) = 0 Then
-                If BotVars.UseAltBnls Then
-                    Call FindBNLSServer
-                    
-                    Exit Sub
-                End If
-            End If
-            
-            Call ConnectBNLS
-        Else
-            Call Event_BNetConnecting
-        End If
-        
         With sckBNet
             If .State <> sckClosed Then
                 AddChat g_Color.ErrorMessageText, "Already connected."
@@ -6557,8 +6543,18 @@ Sub Connect()
                 .RemoteHost = Config.Server
                 .RemotePort = 6112
             End If
-
-            If Not BotVars.BNLS Then .Connect
+            
+            If BotVars.BNLS Then
+                If Len(BotVars.BNLSServer) = 0 And BotVars.UseAltBnls Then
+                    Call FindBNLSServer
+                Else
+                    Call ConnectBNLS
+                End If
+            Else
+                Call Event_BNetConnecting
+                
+                .Connect
+            End If
 
         End With