From a9480f9f64eca6c482888baa4c12c45e9ec65e59 Mon Sep 17 00:00:00 2001
From: Greg Taylor <greg.taylor@aclima.io>
Date: Mon, 7 Sep 2015 14:35:24 -0700
Subject: [PATCH] Make evennia -i block until process is closed. Fixes #803.

---
 evennia/server/evennia_launcher.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index df28e8037e..64067082b2 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -1033,7 +1033,9 @@ def server_operation(mode, service, interactive, profiler):
             GAMEDIR, TWISTED_BINARY, SERVER_LOGFILE,
             PORTAL_LOGFILE, HTTP_LOGFILE])
         # start the server
-        Popen(cmdstr, env=getenv())
+        process = Popen(cmdstr, env=getenv())
+        if interactive:
+            process.wait()
 
     elif mode == 'reload':
         # restarting services