# HG changeset patch
# User katleman
# Date 1373318986 25200
# Node ID c4908732fef5235f1b98cafe0ce507771ef7892c
# Parent  f2342dedf04a6d336302bf94f877892163b0757c# Parent  2c26ccf0a85b6fb02b3364a5d6b13d58f017a3a7
Merge

diff -r f2342dedf04a -r c4908732fef5 src/macosx/native/sun/awt/AWTEvent.m
--- a/src/macosx/native/sun/awt/AWTEvent.m	Fri Jul 05 11:07:03 2013 -0700
+++ b/src/macosx/native/sun/awt/AWTEvent.m	Mon Jul 08 14:29:46 2013 -0700
@@ -382,7 +382,7 @@
 {
     TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
     CFDataRef uchr = (CFDataRef)TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
-    if (uchr == nil) { return; }
+    if (uchr == nil) { return 0; }
     const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout*)CFDataGetBytePtr(uchr);
     // Carbon modifiers should be used instead of NSEvent modifiers
     UInt32 modifierKeyState = (GetCurrentEventKeyModifiers() >> 8) & 0xFF;