diff options
| author |  waker <wakeroid@gmail.com> | 2010-10-20 20:44:53 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2010-10-20 20:44:53 +0200 |
| commit | 4886787e05f757a602f077e436a9b6f8b929ae3d (patch) | |
| tree | 98c539421340a669f8f61e7f40be519c754389d5 /plugins/gtkui/callbacks.c | |
| parent | 641fdb63bbfae645b280b4574da4ea986ac8d582 (diff) | |
| parent | 588fd684fa9abccdbfc1c486187fa5cb40e23cd4 (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'plugins/gtkui/callbacks.c')
| -rw-r--r-- | plugins/gtkui/callbacks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index 0280c773..58a3da41 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -311,12 +311,12 @@ on_mainwin_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - + uint32_t maskedstate = (event->state &~ (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK | GDK_MOD5_MASK)) & 0xfff; if (event->keyval == GDK_n && !event->state) { // button for that one is not in toolbar anymore, so handle it manually deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0); } - else if ((event->state == GDK_MOD1_MASK || event->state == 0) && event->keyval >= GDK_1 && event->keyval <= GDK_9) { + else if ((maskedstate == GDK_MOD1_MASK || maskedstate == 0) && event->keyval >= GDK_1 && event->keyval <= GDK_9) { int pl = event->keyval - GDK_1; if (pl >= 0 && pl < deadbeef->plt_get_count ()) { deadbeef->plt_set_curr (pl); |