From 8de84743bc8ae13ec1aa738358ab13aa928953f5 Mon Sep 17 00:00:00 2001 From: mthiel Date: Thu, 31 Dec 2009 01:50:09 +0000 Subject: [PATCH] Removing some odd logic fromt the keyboard broadcast patch which now causes it to eat keystrokes on clients. I have no idea what the original intention of that was, but it tests out fine without it. --- lib/server/CServer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/server/CServer.cpp b/lib/server/CServer.cpp index f4bc9868..b9baf99b 100644 --- a/lib/server/CServer.cpp +++ b/lib/server/CServer.cpp @@ -1558,8 +1558,7 @@ CServer::onKeyDown(KeyID id, KeyModifierMask mask, KeyButton button, assert(m_active != NULL); // relay - if (!m_keyboardBroadcasting && - (screens && IKeyState::CKeyInfo::isDefault(screens))) { + if (!m_keyboardBroadcasting && IKeyState::CKeyInfo::isDefault(screens)) { m_active->keyDown(id, mask, button); } else { @@ -1586,8 +1585,7 @@ CServer::onKeyUp(KeyID id, KeyModifierMask mask, KeyButton button, assert(m_active != NULL); // relay - if (!m_keyboardBroadcasting && - (screens && IKeyState::CKeyInfo::isDefault(screens))) { + if (!m_keyboardBroadcasting && IKeyState::CKeyInfo::isDefault(screens)) { m_active->keyUp(id, mask, button); } else {