diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-02-28 23:31:51 +0100 |
| commit | 21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979 (patch) | |
| tree | b9679cc1d2c7c3cab0f88c370015f34f6d0b27ca /osdep/macosx_events.m | |
| parent | d1d6257731866934717353fce484f5f472f845d1 (diff) | |
| parent | 1f436f65f2ee4df6419ca68bd6426b8283db6d22 (diff) | |
| download | mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.bz2 mpv-21cd4ff05bb46b375a9ad38c9f0b7f8e71a5d979.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'osdep/macosx_events.m')
| -rw-r--r-- | osdep/macosx_events.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m index 51aaf2aca4..6090a1937e 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -451,7 +451,8 @@ void cocoa_set_input_context(struct input_ctx *input_context) else chars = [event charactersIgnoringModifiers]; - int key = convert_key([event keyCode], *[chars UTF8String]); + struct bstr t = bstr0([chars UTF8String]); + int key = convert_key([event keyCode], bstr_decode_utf8(t, &t)); if (key > -1) [self handleMPKey:key withMask:[self keyModifierMask:event]]; |