diff options
| author | Stanisław Halik <sthalik@misaki.pl> | 2017-05-14 16:22:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-14 16:22:09 +0200 |
| commit | 5c23666b58bb1dd4aea15c0d62a2f716d5be7f52 (patch) | |
| tree | e6497e9b55c073be209ec673ef05e62bf57a2c8f /dinput | |
| parent | 4701dd3b0c8323a11cf7d5ad09c579a9864a41bd (diff) | |
| parent | c392181211b245e74292424500265323c960c1aa (diff) | |
Merge branch 'unstable' into unstable
Diffstat (limited to 'dinput')
| -rw-r--r-- | dinput/keybinding-worker.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dinput/keybinding-worker.cpp b/dinput/keybinding-worker.cpp index b94b762e..0e16ac71 100644 --- a/dinput/keybinding-worker.cpp +++ b/dinput/keybinding-worker.cpp @@ -9,6 +9,7 @@ #ifdef _WIN32 #include "keybinding-worker.hpp" +#include "compat/util.hpp" #include <functional> #include <windows.h> #include <QDebug> @@ -18,8 +19,8 @@ bool Key::should_process() { if (!enabled || (keycode == 0 && guid == "")) return false; - bool ret = !held || timer.elapsed_ms() > 100; - timer.start(); + bool ret = prog1(!held || timer.elapsed_ms() > 100, + timer.start()); return ret; } |