Merge pull request #3249 from Hinsbart/x11_crash

fix x11 crash on exit
2016-01-05 23:48:15 +01:00 · 2016-01-05 23:48:15 +01:00 · bf6429e9ac
parent 37971ef6b8 c0e4d8fbfd
commit bf6429e9ac
1 changed files with 3 additions and 3 deletions
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@ -447,6 +447,9 @@ void OS_X11::finalize() {
 //		memdelete(debugger_connection_console);
 //}

+#ifdef JOYDEV_ENABLED
+	memdelete(joystick);
+#endif
 	memdelete(input);

 	memdelete(sample_manager);
@ -463,9 +466,6 @@ void OS_X11::finalize() {

 	physics_2d_server->finish();
 	memdelete(physics_2d_server);
-#ifdef JOYDEV_ENABLED
-	memdelete(joystick);
-#endif

 	XUnmapWindow( x11_display, x11_window );
 	XDestroyWindow( x11_display, x11_window );