From c59a4f12db96784b054f28d52eaa33cb7553d630 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 12 Feb 2015 18:39:47 +0100
Subject: 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).
---
 player/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'player/main.c')

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;
 
-- 
cgit v1.2.3