1 files changed, 30 insertions, 0 deletions
diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp
index 8427e612e..2a6b583de 100644
--- a/zenutil/zenserverprocess.cpp
+++ b/zenutil/zenserverprocess.cpp
@@ -491,6 +491,36 @@ ZenServerInstance::SpawnServer(int BasePort)
 }
 
 void
+ZenServerInstance::AttachToRunningServer(int BasePort)
+{
+	ZenServerState State;
+	if (!State.InitializeReadOnly())
+	{
+		// TODO: return success/error code instead?
+		throw std::exception("No zen state found");
+	}
+
+	const ZenServerState::ZenServerEntry* Entry = nullptr;
+
+	if (BasePort)
+	{
+		Entry = State.Lookup(BasePort);
+	}
+	else
+	{
+		State.Snapshot([&](const ZenServerState::ZenServerEntry& InEntry) { Entry = &InEntry; });
+	}
+
+	if (!Entry)
+	{
+		// TODO: return success/error code instead?
+		throw std::exception("No server found");
+	}
+
+	m_Process.Initialize(Entry->Pid);
+}
+
+void
 ZenServerInstance::WaitUntilReady()
 {
 	m_ReadyEvent.Wait();