From f12b70d77d42211f06a71eaa61c0e650f06fb501 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 2 Jan 2015 03:09:17 +0100
Subject: player: move terminal input init to a better place

Mostly of cosmetic nature. Move initialization to the same place where
another component (cocoa) will start accessing the input context from a
foreign thread.
---
 player/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/player/main.c b/player/main.c
index 37b1bbdf28..732be8c1da 100644
--- a/player/main.c
+++ b/player/main.c
@@ -440,9 +440,6 @@ int mp_initialize(struct MPContext *mpctx)
     }
 #endif
 
-    if (opts->consolecontrols && cas_terminal_owner(mpctx, mpctx))
-        terminal_setup_getch(mpctx->input);
-
 #if !HAVE_LIBASS
     MP_WARN(mpctx, "Compiled without libass.\n");
     MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n");
@@ -455,6 +452,9 @@ int mp_initialize(struct MPContext *mpctx)
 
     mp_get_resume_defaults(mpctx);
 
+    if (opts->consolecontrols && cas_terminal_owner(mpctx, mpctx))
+        terminal_setup_getch(mpctx->input);
+
 #if HAVE_COCOA
     cocoa_set_input_context(mpctx->input);
 #endif
-- 
cgit v1.2.3