From 1c89fd2ef6564a8117893737ad04a66ee3e6b8af Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Wed, 25 Jul 2012 00:06:27 +0000
Subject: [PATCH] reverted patch for #242 (right shift broken for ms remote
 desktop) to fix bug #2799 (right shift broken for osx).

---
 src/lib/platform/CMSWindowsKeyState.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/lib/platform/CMSWindowsKeyState.cpp b/src/lib/platform/CMSWindowsKeyState.cpp
index bbccd723..6b954bfb 100644
--- a/src/lib/platform/CMSWindowsKeyState.cpp
+++ b/src/lib/platform/CMSWindowsKeyState.cpp
@@ -960,7 +960,18 @@ CMSWindowsKeyState::getKeyMap(CKeyMap& keyMap)
 			// deal with certain virtual keys specially
 			switch (vk) {
 			case VK_SHIFT:
-				vk = VK_LSHIFT;
+				// this is important for sending the correct modifier to the 
+				// client, a patch from bug #242 (right shift broken for ms
+				// remote desktop) removed this to just use left shift, which
+				// caused bug #2799 (right shift broken for osx).
+				// we must not repeat this same mistake and must fix platform
+				// specific bugs in code that only affects that platform.
+				if (MapVirtualKey(VK_RSHIFT, 0) == i) {
+					vk = VK_RSHIFT;
+				}
+				else {
+					vk = VK_LSHIFT;
+				}
 				break;
 
 			case VK_CONTROL: