diff options
| author | wm4 <wm4@nowhere> | 2015-02-12 18:39:47 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-16 18:08:58 +0900 |
| commit | 43879197531d51634983c29a487df242c211d5b5 (patch) | |
| tree | 9ae9777e148df11d71e983dfa0eb621c139ad14a | |
| parent | 94123474a4b665bb7cc7b686703a30069daadf77 (diff) | |
| download | mpv-43879197531d51634983c29a487df242c211d5b5.tar.bz2 mpv-43879197531d51634983c29a487df242c211d5b5.tar.xz | |
osx: move code to unset input context to the right place
Setting the input context is always called, both in cplayer and libmpv,
and under HAVE_COCOA. Unsetting the input context was done only the
cplayer uninit call. Also it was under HAVE_COCOA_APPLICATION, so it was
not unset in libmpv (dangling pointer).
(cherry picked from commit c59a4f12db96784b054f28d52eaa33cb7553d630)
| -rw-r--r-- | player/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/player/main.c b/player/main.c index 118aef9eed..4a8f723bb2 100644 --- a/player/main.c +++ b/player/main.c @@ -164,6 +164,10 @@ void mp_destroy(struct MPContext *mpctx) osd_free(mpctx->osd); +#if HAVE_COCOA + cocoa_set_input_context(NULL); +#endif + if (cas_terminal_owner(mpctx, mpctx)) { terminal_uninit(); cas_terminal_owner(mpctx, NULL); @@ -183,10 +187,6 @@ void mp_destroy(struct MPContext *mpctx) static int prepare_exit_cplayer(struct MPContext *mpctx, enum exit_reason how) { -#if HAVE_COCOA_APPLICATION - cocoa_set_input_context(NULL); -#endif - int rc = 0; const char *reason = NULL; |