Merge branch 'busybox' into merge

1 files changed, 5 insertions, 4 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 0b4e326d8..0ec9baa5f 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2462,13 +2462,14 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 timeout = st->timeout;
         }
 #if MAX_HISTORY > 0
+        if (state->flags & DO_HISTORY) {
 # if ENABLE_FEATURE_EDITING_SAVEHISTORY
-        if (state->hist_file)
-                if (state->cnt_history == 0)
-                        load_history(state);
+                if (state->hist_file)
+                        if (state->cnt_history == 0)
+                                load_history(state);
 # endif
-        if (state->flags & DO_HISTORY)
                 state->cur_history = state->cnt_history;
+        }
 #endif
 
         /* prepare before init handlers */