diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-01-05 23:48:15 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-01-05 23:48:15 +0100 |
| commit | bf6429e9aca86acafd790cd2fb77bf31c009bb44 (patch) | |
| tree | 33b9ed58c7f5bfeb36ed968a686f38a0c5efa766 /platform/x11/os_x11.cpp | |
| parent | 37971ef6b8730a6fe9b26e8c379f399af7b22b69 (diff) | |
| parent | c0e4d8fbfde19f741cb6e27aac9b4b2634c866e8 (diff) | |
Merge pull request #3249 from Hinsbart/x11_crash
fix x11 crash on exit
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 6 |
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 ); |