follow-up for issue #1512
The previous fix, while valid, still prompts for input during early options processing if stdin is a tty. It really shouldn't be doing that during early options such as --showpaths, so alter the placement of the program_state.earlyoptions flag within *main().
This commit is contained in:
+1
-1
@@ -132,7 +132,6 @@ main(int argc, char *argv[])
|
||||
program_state.early_options = 1;
|
||||
/* handle -dalthackdir, -s <score stuff>, --version, --showpaths */
|
||||
early_options(&argc, &argv, &dir);
|
||||
program_state.early_options = 0;
|
||||
#ifdef CHDIR
|
||||
/*
|
||||
* Change directories before we initialize the window system so
|
||||
@@ -146,6 +145,7 @@ main(int argc, char *argv[])
|
||||
#ifdef __linux__
|
||||
check_linux_console();
|
||||
#endif
|
||||
program_state.early_options = 0;
|
||||
|
||||
initoptions();
|
||||
#ifdef PANICTRACE
|
||||
|
||||
Reference in New Issue
Block a user