From 8437356b6c615ac93f49fe122a591a229722dbe8 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 6 Feb 2014 16:49:50 +0100
Subject: options: add --no-terminal switch

Mostly useful for internal reasons. This code will be enabled by
default if mpv is started via the client API.
---
 player/loadfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'player/loadfile.c')

diff --git a/player/loadfile.c b/player/loadfile.c
index 9ba5a00758..662a714ec0 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1097,7 +1097,7 @@ static void play_current_file(struct MPContext *mpctx)
     load_per_file_options(mpctx->mconfig, mpctx->playlist->current->params,
                           mpctx->playlist->current->num_params);
 
-    if (!opts->consolecontrols)
+    if (opts->use_terminal && !opts->consolecontrols)
         getch2_disable();
 
 #if HAVE_LIBASS
@@ -1393,7 +1393,7 @@ terminate_playback:  // don't jump here after ao/vo/getch initialization!
     if (mpctx->stop_play != PT_RESTART)
         m_config_restore_backups(mpctx->mconfig);
 
-    if (opts->consolecontrols)
+    if (opts->use_terminal && opts->consolecontrols)
         getch2_enable();
 
     mpctx->filename = NULL;
-- 
cgit v1.2.3