summaryrefslogtreecommitdiff
path: root/platform/x11/os_x11.cpp
diff options
context:
space:
mode:
authorhondres <liu.gam3@gmail.com>2016-01-05 23:35:54 +0100
committerhondres <liu.gam3@gmail.com>2016-01-05 23:35:54 +0100
commitc0e4d8fbfde19f741cb6e27aac9b4b2634c866e8 (patch)
tree33b9ed58c7f5bfeb36ed968a686f38a0c5efa766 /platform/x11/os_x11.cpp
parent37971ef6b8730a6fe9b26e8c379f399af7b22b69 (diff)
fix x11 crash on exit
Diffstat (limited to 'platform/x11/os_x11.cpp')
-rw-r--r--platform/x11/os_x11.cpp6
1 files changed, 3 insertions, 3 deletions
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 );