From ba1a3a9fd779e2f403df3a6234370529a511c6ff Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 25 Oct 2022 10:22:54 +0200 Subject: Revert ctrl+q --- src/QuickMedia.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 3e41899..57c5489 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -3587,11 +3587,9 @@ namespace QuickMedia { KeySym pressed_keysym = XKeycodeToKeysym(disp, xev.xkey.keycode, 0); #pragma GCC diagnostic pop bool pressing_ctrl = (CLEANMASK(xev.xkey.state) == ControlMask); - if(pressed_keysym == XK_q) { - current_page = previous_page; - go_to_previous_page = true; - break; - } else if(pressed_keysym == XK_Escape || pressed_keysym == XK_q || pressed_keysym == XK_BackSpace) { + if(pressed_keysym == XK_q && pressing_ctrl) { + window.close(); + } else if(pressed_keysym == XK_Escape || pressed_keysym == XK_BackSpace) { if(window_is_fullscreen(disp, window.get_system_handle())) { if(pressed_keysym != XK_Escape) video_player->cycle_fullscreen(); @@ -3600,6 +3598,10 @@ namespace QuickMedia { go_to_previous_page = true; break; } + } else if(pressed_keysym == XK_q && !pressing_ctrl) { + current_page = previous_page; + go_to_previous_page = true; + break; } else if(pressed_keysym == XK_f && pressing_ctrl) { video_player->cycle_fullscreen(); } else if(pressed_keysym == XK_s && pressing_ctrl && !video_page->is_local()) { -- cgit v1.2.3