From b368234daee25b8cf3731e4d71223c129ca0eb28 Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Sat, 30 Sep 2017 06:27:05 +0200
Subject: [PATCH] Delete editor before graphics (fixes #881)

---
 src/engine/client/client.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 0428968ef..3b5fbcc0e 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -2884,6 +2884,7 @@ void CClient::Run()
 	GameClient()->OnShutdown();
 	Disconnect();
 
+	delete m_pEditor;
 	m_pGraphics->Shutdown();
 
 	// shutdown SDL
@@ -3492,7 +3493,7 @@ int main(int argc, const char **argv) // ignore_convention
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IEngineMasterServer*>(pEngineMasterServer)); // register as both
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IMasterServer*>(pEngineMasterServer), false);
 
-		RegisterFail = RegisterFail || !pKernel->RegisterInterface(CreateEditor());
+		RegisterFail = RegisterFail || !pKernel->RegisterInterface(CreateEditor(), false);
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(CreateGameClient(), false);
 		RegisterFail = RegisterFail || !pKernel->RegisterInterface(pStorage);