From ff8e80816a8e0a67644c0cb62bbfa01a5eb94246 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 24 Oct 2014 05:16:24 +0200 Subject: always initialize keycode et al on win32 --- opentrack/shortcuts.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'opentrack/shortcuts.cpp') diff --git a/opentrack/shortcuts.cpp b/opentrack/shortcuts.cpp index 77c57237..6ccefef9 100644 --- a/opentrack/shortcuts.cpp +++ b/opentrack/shortcuts.cpp @@ -157,16 +157,13 @@ void Shortcuts::bind_keyboard_shortcut(K &key, key_opts& k) } #else int idx = k.key_index; - if (idx > 0) - { - key.keycode = 0; - key.shift = key.alt = key.ctrl = 0; - if (idx < global_windows_key_sequences.size()) - key.keycode = global_windows_key_sequences[idx]; - key.shift = k.shift; - key.alt = k.alt; - key.ctrl = k.ctrl; - } + key.keycode = 0; + key.shift = key.alt = key.ctrl = 0; + if (idx > 0 && idx < global_windows_key_sequences.size()) + key.keycode = global_windows_key_sequences[idx]; + key.shift = k.shift; + key.alt = k.alt; + key.ctrl = k.ctrl; #endif } void Shortcuts::reload() { -- cgit v1.2.3