From 8ed944368c35ef8584c29439339c2d92a92441e5 Mon Sep 17 00:00:00 2001
From: Colin Wallace <wallacoloo@gmail.com>
Date: Sun, 5 Apr 2015 02:55:54 +0000
Subject: [PATCH] Fix OSX key translation crash (#504)

---
 src/arch/InputHandler/InputHandler_MacOSX_HID.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/InputHandler/InputHandler_MacOSX_HID.cpp b/src/arch/InputHandler/InputHandler_MacOSX_HID.cpp
index 977749557c..9caf82c778 100644
--- a/src/arch/InputHandler/InputHandler_MacOSX_HID.cpp
+++ b/src/arch/InputHandler/InputHandler_MacOSX_HID.cpp
@@ -380,7 +380,7 @@ static wchar_t KeyCodeToChar(CGKeyCode keyCode, unsigned int modifierFlags)
 {
 	TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
 	CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
-	const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr);
+	const UCKeyboardLayout *keyboardLayout = uchr ? (const UCKeyboardLayout*)CFDataGetBytePtr(uchr) : NULL;
 	
 	if( keyboardLayout )
 	{