3 files changed, 30 insertions, 22 deletions

diff --git a/player/command.c b/player/command.c
index a4a4263dde..bd7380cbec 100644
--- a/player/command.c
+++ b/player/command.c
@@ -5631,7 +5631,7 @@ void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags)
     struct MPContext *mpctx = ctx;
 
     if (flags & UPDATE_TERM)
-        mp_msg_update_msglevels(mpctx->global);
+        mp_update_logging(mpctx);
 
     if (flags & UPDATE_RENDERER) {
         if (mpctx->video_out)
diff --git a/player/core.h b/player/core.h
index 22e19e49ef..c36972e807 100644
--- a/player/core.h
+++ b/player/core.h
@@ -487,6 +487,7 @@ struct MPContext *mp_create(void);
 void mp_destroy(struct MPContext *mpctx);
 void mp_print_version(struct mp_log *log, int always);
 void wakeup_playloop(void *ctx);
+void mp_update_logging(struct MPContext *mpctx);
 
 // misc.c
 double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t);
diff --git a/player/main.c b/player/main.c
index 334224d6a6..afdb6d1e5a 100644
--- a/player/main.c
+++ b/player/main.c
@@ -116,11 +116,23 @@ static bool cas_terminal_owner(struct MPContext *old, struct MPContext *new)
     return r;
 }
 
-static void update_logging(struct MPContext *mpctx)
+void mp_update_logging(struct MPContext *mpctx)
 {
     mp_msg_update_msglevels(mpctx->global);
-    if (mpctx->opts->use_terminal && cas_terminal_owner(NULL, mpctx))
-        terminal_init();
+
+    bool enable = mpctx->opts->use_terminal;
+    bool enabled = cas_terminal_owner(mpctx, mpctx);
+    if (enable != enabled) {
+        if (enable && cas_terminal_owner(NULL, mpctx)) {
+            terminal_init();
+        } else if (!enable) {
+            terminal_uninit();
+            cas_terminal_owner(mpctx, NULL);
+        }
+    }
+
+    if (cas_terminal_owner(mpctx, mpctx) && mpctx->opts->consolecontrols)
+        terminal_setup_getch(mpctx->input);
 }
 
 void mp_print_version(struct mp_log *log, int always)
@@ -356,12 +368,6 @@ struct MPContext *mp_create(void)
 
     mp_input_set_cancel(mpctx->input, mpctx->playback_abort);
 
-    mpctx->mconfig->option_set_callback = mp_on_set_option;
-    mpctx->mconfig->option_set_callback_cb = mpctx;
-
-    mpctx->mconfig->option_change_callback = mp_option_change_callback;
-    mpctx->mconfig->option_change_callback_ctx = mpctx;
-
     return mpctx;
 }
 
@@ -376,32 +382,39 @@ int mp_initialize(struct MPContext *mpctx, char **options)
 
     assert(!mpctx->initialized);
 
-    if (options) {
-        // Preparse the command line, so we can init the terminal early.
+    // Preparse the command line, so we can init the terminal early.
+    if (options)
         m_config_preparse_command_line(mpctx->mconfig, mpctx->global, options);
 
-        update_logging(mpctx);
+    mp_update_logging(mpctx);
 
+    if (options) {
         MP_VERBOSE(mpctx, "Command line options:");
         for (int i = 0; options[i]; i++)
             MP_VERBOSE(mpctx, " '%s'", options[i]);
         MP_VERBOSE(mpctx, "\n");
     }
 
-    update_logging(mpctx);
     mp_print_version(mpctx->log, false);
 
     mp_parse_cfgfiles(mpctx);
-    update_logging(mpctx);
 
     if (options) {
         int r = m_config_parse_mp_command_line(mpctx->mconfig, mpctx->playlist,
                                                mpctx->global, options);
         if (r < 0)
             return r == M_OPT_EXIT ? -2 : -1;
-        update_logging(mpctx);
     }
 
+    // From this point on, all mpctx members are initialized.
+    mpctx->initialized = true;
+    mpctx->mconfig->option_set_callback = mp_on_set_option;
+    mpctx->mconfig->option_set_callback_cb = mpctx;
+    mpctx->mconfig->option_change_callback = mp_option_change_callback;
+    mpctx->mconfig->option_change_callback_ctx = mpctx;
+    // Run all update handlers.
+    mp_option_change_callback(mpctx, NULL, UPDATE_OPTS_MASK);
+
     if (handle_help_options(mpctx))
         return -2;
 
@@ -448,18 +461,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
     MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n");
 #endif
 
-    // From this point on, all mpctx members are initialized.
-    mpctx->initialized = true;
-
     mp_get_resume_defaults(mpctx);
 
     // Lua user scripts (etc.) can call arbitrary functions. Load them at a point
     // where this is safe.
     mp_load_scripts(mpctx);
 
-    if (opts->consolecontrols && cas_terminal_owner(mpctx, mpctx))
-        terminal_setup_getch(mpctx->input);
-
     if (opts->force_vo == 2 && handle_force_window(mpctx, false) < 0)
         return -1;