Merge
authorkatleman
Mon, 08 Jul 2013 14:29:46 -0700
changeset 18600 5b24b75e2710
parent 18598 cb917bd9c305 (current diff)
parent 18599 213883c7fab6 (diff)
child 18601 569d75ee1239
Merge
--- a/jdk/src/macosx/native/sun/awt/AWTEvent.m	Fri Jul 05 11:07:03 2013 -0700
+++ b/jdk/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;