From 027c2a849f0c71a71fa0e0ab7efda119ec939efb Mon Sep 17 00:00:00 2001 From: mthiel Date: Thu, 31 Dec 2009 01:23:53 +0000 Subject: [PATCH] Previously applied keyboard broadcasting patch broke the original keystroke / keyDown / keyUp screens feature. Fixed --- lib/server/CServer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/server/CServer.cpp b/lib/server/CServer.cpp index f3314c95..f4bc9868 100644 --- a/lib/server/CServer.cpp +++ b/lib/server/CServer.cpp @@ -1558,7 +1558,7 @@ CServer::onKeyDown(KeyID id, KeyModifierMask mask, KeyButton button, assert(m_active != NULL); // relay - if (!m_keyboardBroadcasting || + if (!m_keyboardBroadcasting && (screens && IKeyState::CKeyInfo::isDefault(screens))) { m_active->keyDown(id, mask, button); } @@ -1586,7 +1586,7 @@ CServer::onKeyUp(KeyID id, KeyModifierMask mask, KeyButton button, assert(m_active != NULL); // relay - if (!m_keyboardBroadcasting || + if (!m_keyboardBroadcasting && (screens && IKeyState::CKeyInfo::isDefault(screens))) { m_active->keyUp(id, mask, button); }