aboutsummaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMSC2016-04-03 19:24:39 +0200
committerRémi Verschelde2016-04-06 18:46:53 +0200
commit4220ffbd8ef2d7b493cb39f1e3f574bfcfe9de7a (patch)
treed26e0027e16ebb65fdce4fb23ad3a0d4525e86ac /platform
parent43c74056b1764f07acc252e78e1cfa29a49a51c3 (diff)
downloadgodot-4220ffbd8ef2d7b493cb39f1e3f574bfcfe9de7a.tar.gz
godot-4220ffbd8ef2d7b493cb39f1e3f574bfcfe9de7a.tar.zst
godot-4220ffbd8ef2d7b493cb39f1e3f574bfcfe9de7a.zip
memdelete 'joy_thread' + 'joy_mutex' on ::~joystick_linux()
(cherry picked from commit 391095e0efe075268b892ff47a5885f5a6e2706f)
Diffstat (limited to 'platform')
-rw-r--r--platform/x11/joystick_linux.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joystick_linux.cpp
index 9a52c4ff3..0e50d2b24 100644
--- a/platform/x11/joystick_linux.cpp
+++ b/platform/x11/joystick_linux.cpp
@@ -89,6 +89,8 @@ joystick_linux::joystick_linux(InputDefault *in)
joystick_linux::~joystick_linux() {
exit_udev = true;
Thread::wait_to_finish(joy_thread);
+ memdelete(joy_thread);
+ memdelete(joy_mutex);
close_joystick();
}