#6346 Don't add scrlk as a hotkey to lock screen if it's disabled

This commit is contained in:
XinyuHou 2016-11-24 13:57:39 +00:00 committed by Nick Bolton
parent 6ccd4d71b8
commit 1852f7477c
1 changed files with 1 additions and 1 deletions

View File

@ -290,7 +290,7 @@ Server::setConfig(const Config& config)
// we will unfortunately generate a warning. if the user has // we will unfortunately generate a warning. if the user has
// configured a LockCursorToScreenAction then we don't add // configured a LockCursorToScreenAction then we don't add
// ScrollLock as a hotkey. // ScrollLock as a hotkey.
if (!m_config->hasLockToScreenAction()) { if (!m_disableLockToScreen && !m_config->hasLockToScreenAction()) {
IPlatformScreen::KeyInfo* key = IPlatformScreen::KeyInfo* key =
IPlatformScreen::KeyInfo::alloc(kKeyScrollLock, 0, 0, 0); IPlatformScreen::KeyInfo::alloc(kKeyScrollLock, 0, 0, 0);
InputFilter::Rule rule(new InputFilter::KeystrokeCondition(m_events, key)); InputFilter::Rule rule(new InputFilter::KeystrokeCondition(m_events, key));