From c3e6cc7372df9d7807831794a10132e86e585576 Mon Sep 17 00:00:00 2001 From: KytechN24 Date: Wed, 15 Mar 2017 17:00:57 -0600 Subject: [PATCH 1/2] Fix media keys duplication bug on Windows 10 Fixes media key duplication issue on Windows 10 when enabling Windows 10 System Media Service --- src/main/features/core/keyboardShortcuts.js | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/main/features/core/keyboardShortcuts.js b/src/main/features/core/keyboardShortcuts.js index acf5a75ba..ef26fee50 100644 --- a/src/main/features/core/keyboardShortcuts.js +++ b/src/main/features/core/keyboardShortcuts.js @@ -1,5 +1,6 @@ import _ from 'lodash'; import { globalShortcut } from 'electron'; +import os from 'os'; // ↓ Without the lambda it crashes - Electron bug ? let keyRegisterFn = (...args) => globalShortcut.register(...args); @@ -11,21 +12,23 @@ if (process.platform === 'win32') { }; } -keyRegisterFn('MediaPreviousTrack', () => { - Emitter.sendToGooglePlayMusic('playback:previousTrack'); -}); +if (!(process.platform === 'win32' && os.release().startsWith('10.') && Settings.get('enableWin10MediaService'))) { + keyRegisterFn('MediaPreviousTrack', () => { + Emitter.sendToGooglePlayMusic('playback:previousTrack'); + }); -keyRegisterFn('MediaPlayPause', () => { - Emitter.sendToGooglePlayMusic('playback:playPause'); -}); + keyRegisterFn('MediaPlayPause', () => { + Emitter.sendToGooglePlayMusic('playback:playPause'); + }); -keyRegisterFn('MediaNextTrack', () => { - Emitter.sendToGooglePlayMusic('playback:nextTrack'); -}); + keyRegisterFn('MediaNextTrack', () => { + Emitter.sendToGooglePlayMusic('playback:nextTrack'); + }); -keyRegisterFn('MediaStop', () => { - Emitter.sendToGooglePlayMusic('playback:stop'); -}); + keyRegisterFn('MediaStop', () => { + Emitter.sendToGooglePlayMusic('playback:stop'); + }); +} const customHotkeysTemplate = { playPause: null, From ceba16d60c182189c061a25091e7ca39dd85f965 Mon Sep 17 00:00:00 2001 From: Kytech Date: Sun, 26 Apr 2020 21:15:22 -0600 Subject: [PATCH 2/2] Updated Win SMTP double-skip fix to work w/ new settings. --- src/main/features/core/keyboardShortcuts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/features/core/keyboardShortcuts.js b/src/main/features/core/keyboardShortcuts.js index 1b17ab66c..5924caac4 100644 --- a/src/main/features/core/keyboardShortcuts.js +++ b/src/main/features/core/keyboardShortcuts.js @@ -12,7 +12,7 @@ if (process.platform === 'win32') { }; } -if (!(process.platform === 'win32' && os.release().startsWith('10.') && Settings.get('enableWin10MediaService'))) { +if (!(process.platform === 'win32' && os.release().startsWith('10.') && Settings.get('enableWin10MediaServiceTrackInfo'))) { keyRegisterFn('MediaPreviousTrack', () => { Emitter.sendToGooglePlayMusic('playback:previousTrack'); });