From d1b80c4a6ee6c052985110120f90b4f983d966a6 Mon Sep 17 00:00:00 2001
From: Martin Ridgers <martin.ridgers@epicgames.com>
Date: Mon, 4 Aug 2025 09:49:15 +0200
Subject: Set ready event when reusing an existing server instance. (#448)

* Moved firing of child-id event into a lambda
* Fire notify event to parent after attaching to an existing instance
* Updated changelog
---
 src/zenserver/main.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/zenserver/main.cpp')

diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index b0d945814..6d9a478be 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -117,6 +117,14 @@ ZenEntryPoint::Run()
 		ServerState.Initialize();
 		ServerState.Sweep();
 
+		auto NotifyReady = [&] {
+			if (!m_ServerOptions.ChildId.empty())
+			{
+				NamedEvent ParentEvent{m_ServerOptions.ChildId};
+				ParentEvent.Set();
+			}
+		};
+
 		uint32_t						AttachSponsorProcessRetriesLeft = 3;
 		ZenServerState::ZenServerEntry* Entry							= ServerState.Lookup(m_ServerOptions.BasePort);
 		while (Entry)
@@ -155,6 +163,7 @@ ZenEntryPoint::Run()
 				// Sponsor processes are checked every second, so 2 second wait time should be enough
 				if (Entry->AddSponsorProcess(m_ServerOptions.OwnerPid, 2000))
 				{
+					NotifyReady();
 					std::exit(0);
 				}
 				if (AttachSponsorProcessRetriesLeft-- > 0)
@@ -294,12 +303,7 @@ ZenEntryPoint::Run()
 
 		Server.SetIsReadyFunc([&] {
 			m_LockFile.Update(MakeLockData(true), Ec);
-
-			if (!m_ServerOptions.ChildId.empty())
-			{
-				NamedEvent ParentEvent{m_ServerOptions.ChildId};
-				ParentEvent.Set();
-			}
+			NotifyReady();
 		});
 
 		Server.Run();
-- 
cgit v1.2.3