From c0e4d8fbfde19f741cb6e27aac9b4b2634c866e8 Mon Sep 17 00:00:00 2001
From: hondres <liu.gam3@gmail.com>
Date: Tue, 5 Jan 2016 23:35:54 +0100
Subject: fix x11 crash on exit

---
 platform/x11/os_x11.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'platform/x11/os_x11.cpp')

diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 75ec9fd5de..437e41eead 100644
--- 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 );
-- 
cgit v1.2.3