diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-19 01:41:49 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-19 01:42:16 +0100 |
| commit | 42217bbb858ddb158ad13777e2aace942aaf9525 (patch) | |
| tree | ff9ff0ee038d38e06fc6ff1969b131a1f42cc510 | |
| parent | 73c62db8a98e676328a17569b821a0fb3c397a39 (diff) | |
shortcuts: nix single-use mutex
It also slept with lock held. Good riddance.
| -rw-r--r-- | opentrack/keybinding-worker.cpp | 2 | ||||
| -rw-r--r-- | opentrack/keybinding-worker.hpp | 1 | ||||
| -rw-r--r-- | opentrack/shortcuts.cpp | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/opentrack/keybinding-worker.cpp b/opentrack/keybinding-worker.cpp index fd777211..31eb9e80 100644 --- a/opentrack/keybinding-worker.cpp +++ b/opentrack/keybinding-worker.cpp @@ -99,8 +99,6 @@ void KeybindingWorker::run() { joy_ctx.poll(f); } - QMutexLocker l(&mtx); - for (int i = 0; i < 256; i++) { Key k; diff --git a/opentrack/keybinding-worker.hpp b/opentrack/keybinding-worker.hpp index cb3e5f9f..b5d63fac 100644 --- a/opentrack/keybinding-worker.hpp +++ b/opentrack/keybinding-worker.hpp @@ -58,7 +58,6 @@ struct OPENTRACK_EXPORT KeybindingWorker : public QThread { private: LPDIRECTINPUT8 din; LPDIRECTINPUTDEVICE8 dinkeyboard; - QMutex mtx; win32_joy_ctx joy_ctx; public: volatile bool should_quit; diff --git a/opentrack/shortcuts.cpp b/opentrack/shortcuts.cpp index 6eab6071..059febdb 100644 --- a/opentrack/shortcuts.cpp +++ b/opentrack/shortcuts.cpp @@ -8,7 +8,6 @@ #include "shortcuts.h" #include "win32-shortcuts.h" -#include <QMutexLocker> void Shortcuts::bind_keyboard_shortcut(K &key, key_opts& k) { |