From a45bcfcd821e22c6984296349a3ca2be8ab271b9 Mon Sep 17 00:00:00 2001
From: Muxy <muxy@goulp.net>
Date: Wed, 8 May 2024 19:06:06 +0200
Subject: [PATCH] Fix: Send Network Welcome Packet to admin port after game
 creation completed

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

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 6b34df1229..297feb95b7 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -936,10 +936,13 @@ bool NetworkServerStart()
 	/* if the server is dedicated ... add some other script */
 	if (_network_dedicated) IConsoleCmdExec("exec scripts/on_dedicated.scr 0");
 
+	return true;
+}
+
+void NetworkServerSendWelcome( void )
+{
 	/* welcome possibly still connected admins - this can only happen on a dedicated server. */
 	if (_network_dedicated) ServerNetworkAdminSocketHandler::WelcomeAll();
-
-	return true;
 }
 
 /**
diff --git a/src/network/network_func.h b/src/network/network_func.h
index d1dcd05d6c..71dbae67fc 100644
--- a/src/network/network_func.h
+++ b/src/network/network_func.h
@@ -67,6 +67,7 @@ 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 fd913f2ce2..e1cea46387 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -1200,6 +1200,10 @@ void SwitchToMode(SwitchMode new_mode)
 
 		default: NOT_REACHED();
 	}
+
+	if (_is_network_server) {
+		NetworkServerSendWelcome();
+	}
 }