From debd8971f10056a291fd22fedd1e2a0a86d869b8 Mon Sep 17 00:00:00 2001
From: Muxy <muxy@goulp.net>
Date: Wed, 8 May 2024 21:53:45 +0200
Subject: [PATCH] Fix: [AdminPort] #12411 Send Network Welcome Packet to admin
 port after game creation completed Welcome moved into OnGameStart

---
 src/network/network.cpp    | 9 +++------
 src/network/network_func.h | 1 -
 src/openttd.cpp            | 4 ----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 297feb95b7..c0c13efb1d 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -939,12 +939,6 @@ bool NetworkServerStart()
 	return true;
 }
 
-void NetworkServerSendWelcome( void )
-{
-	/* welcome possibly still connected admins - this can only happen on a dedicated server. */
-	if (_network_dedicated) ServerNetworkAdminSocketHandler::WelcomeAll();
-}
-
 /**
  * Perform tasks when the server is started. This consists of things
  * like putting the server's client in a valid company and resetting the restart time.
@@ -972,6 +966,9 @@ void NetworkOnGameStart()
 		}
 
 		ShowClientList();
+	} else {
+		/* welcome possibly still connected admins - this can only happen on a dedicated server. */
+		ServerNetworkAdminSocketHandler::WelcomeAll();
 	}
 }
 
diff --git a/src/network/network_func.h b/src/network/network_func.h
index 71dbae67fc..d1dcd05d6c 100644
--- a/src/network/network_func.h
+++ b/src/network/network_func.h
@@ -67,7 +67,6 @@ void NetworkServerSendConfigUpdate();
 void NetworkServerUpdateGameInfo();
 void NetworkServerShowStatusToConsole();
 bool NetworkServerStart();
-void NetworkServerSendWelcome();
 void NetworkServerNewCompany(const Company *company, NetworkClientInfo *ci);
 bool NetworkServerChangeClientName(ClientID client_id, const std::string &new_name);
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 1455bca9ae..307e60874b 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1202,10 +1202,6 @@ void SwitchToMode(SwitchMode new_mode)
 
 		default: NOT_REACHED();
 	}
-
-	if (_is_network_server) {
-		NetworkServerSendWelcome();
-	}
 }