Delete editor before graphics (fixes #881)

This commit is contained in:
def 2017-09-30 06:27:05 +02:00
parent 4fe6dc51f7
commit b368234dae

View file

@ -2884,6 +2884,7 @@ void CClient::Run()
GameClient()->OnShutdown(); GameClient()->OnShutdown();
Disconnect(); Disconnect();
delete m_pEditor;
m_pGraphics->Shutdown(); m_pGraphics->Shutdown();
// shutdown SDL // 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<IEngineMasterServer*>(pEngineMasterServer)); // register as both
RegisterFail = RegisterFail || !pKernel->RegisterInterface(static_cast<IMasterServer*>(pEngineMasterServer), false); 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(CreateGameClient(), false);
RegisterFail = RegisterFail || !pKernel->RegisterInterface(pStorage); RegisterFail = RegisterFail || !pKernel->RegisterInterface(pStorage);