From 1852f7477ce3efde2e0f596ee68d03d6cdbc2244 Mon Sep 17 00:00:00 2001 From: XinyuHou Date: Thu, 24 Nov 2016 13:57:39 +0000 Subject: [PATCH] #6346 Don't add scrlk as a hotkey to lock screen if it's disabled --- src/lib/server/Server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp index 684806f2..6c17f937 100644 --- a/src/lib/server/Server.cpp +++ b/src/lib/server/Server.cpp @@ -290,7 +290,7 @@ Server::setConfig(const Config& config) // we will unfortunately generate a warning. if the user has // configured a LockCursorToScreenAction then we don't add // ScrollLock as a hotkey. - if (!m_config->hasLockToScreenAction()) { + if (!m_disableLockToScreen && !m_config->hasLockToScreenAction()) { IPlatformScreen::KeyInfo* key = IPlatformScreen::KeyInfo::alloc(kKeyScrollLock, 0, 0, 0); InputFilter::Rule rule(new InputFilter::KeystrokeCondition(m_events, key));