Set event receiver to null before the receiver object is deleted
* Merge branch 'master' into minenux
This commit is contained in:
commit
acbd75d2bc
@ -70,6 +70,11 @@ static void dump_start_data(const GameStartData &data)
|
|||||||
|
|
||||||
ClientLauncher::~ClientLauncher()
|
ClientLauncher::~ClientLauncher()
|
||||||
{
|
{
|
||||||
|
RenderingEngine *rendering_engine = RenderingEngine::get_instance();
|
||||||
|
|
||||||
|
if (rendering_engine && rendering_engine->get_raw_device())
|
||||||
|
rendering_engine->get_raw_device()->setEventReceiver(nullptr);
|
||||||
|
|
||||||
delete receiver;
|
delete receiver;
|
||||||
|
|
||||||
delete input;
|
delete input;
|
||||||
@ -77,7 +82,7 @@ ClientLauncher::~ClientLauncher()
|
|||||||
delete g_fontengine;
|
delete g_fontengine;
|
||||||
delete g_gamecallback;
|
delete g_gamecallback;
|
||||||
|
|
||||||
delete RenderingEngine::get_instance();
|
delete rendering_engine;
|
||||||
|
|
||||||
#if USE_SOUND
|
#if USE_SOUND
|
||||||
deleteSoundManagerSingleton(g_sound_manager_singleton);
|
deleteSoundManagerSingleton(g_sound_manager_singleton);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user