From a64bdac272a1f37474576b33a7d72988e3efe80d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 8 Jul 2018 12:30:55 +0000 Subject: hotkey: fixed windows support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8119 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/hotkey/hotkeymanager_x11.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/plugins/General/hotkey/hotkeymanager_x11.cpp') diff --git a/src/plugins/General/hotkey/hotkeymanager_x11.cpp b/src/plugins/General/hotkey/hotkeymanager_x11.cpp index 0e1fab263..4775102df 100644 --- a/src/plugins/General/hotkey/hotkeymanager_x11.cpp +++ b/src/plugins/General/hotkey/hotkeymanager_x11.cpp @@ -112,15 +112,14 @@ HotkeyManager::HotkeyManager(QObject *parent) : QObject(parent) HotkeyManager::~HotkeyManager() { - if(qApp && qApp->eventDispatcher()) - qApp->removeNativeEventFilter(this); - foreach(Hotkey *key, m_grabbedKeys) + qApp->removeNativeEventFilter(this); + while(!m_grabbedKeys.isEmpty()) { + Hotkey *key = m_grabbedKeys.takeFirst (); if(key->code) XUngrabKey(QX11Info::display(), key->code, key->mod, QX11Info::appRootWindow()); + delete key; } - while (!m_grabbedKeys.isEmpty()) - delete m_grabbedKeys.takeFirst (); } const QString HotkeyManager::getKeyString(quint32 key, quint32 modifiers) @@ -200,9 +199,7 @@ bool HotkeyManager::nativeEventFilter(const QByteArray &eventType, void *message case Hotkey::VOLUME_MUTE: SoundCore::instance()->setMuted(!SoundCore::instance()->isMuted()); break; - } - } } return false; -- cgit v1.2.3-13-gbd6f