Merging upstream version 3:4.8.31.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main.c b/src/main.c
index c18e069..fcc31bb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /*
    Main program for the Midnight Commander
 
-   Copyright (C) 1994-2023
+   Copyright (C) 1994-2024
    Free Software Foundation, Inc.
 
    Written by:
@@ -279,6 +279,13 @@ main (int argc, char *argv[])
         return exit_code;
     }
 
+    /* check terminal type
+     * $TERM must be set and not empty
+     * mc_global.tty.xterm_flag is used in init_key() and tty_init()
+     * Do this after mc_args_parse() where mc_args__force_xterm is set up.
+     */
+    mc_global.tty.xterm_flag = tty_check_term (mc_args__force_xterm);
+
     /* do this before mc_args_show_info () to view paths in the --datadir-info output */
     OS_Setup ();
 
@@ -346,13 +353,6 @@ main (int argc, char *argv[])
         vfs_path_free (vpath, TRUE);
     }
 
-    /* check terminal type
-     * $TERM must be set and not empty
-     * mc_global.tty.xterm_flag is used in init_key() and tty_init()
-     * Do this after mc_args_handle() where mc_args__force_xterm is set up.
-     */
-    mc_global.tty.xterm_flag = tty_check_term (mc_args__force_xterm);
-
     /* NOTE: This has to be called before tty_init or whatever routine
        calls any define_sequence */
     init_key ();