diff --git a/client/src/flash.c b/client/src/flash.c index 962192cda..933f91e88 100644 --- a/client/src/flash.c +++ b/client/src/flash.c @@ -577,6 +577,13 @@ static void flash_suggest_update_bootloader(void) { PrintAndLogEx(INFO, "---------------------------------------------------"); PrintAndLogEx(NORMAL, ""); gs_printed_msg = true; + if (g_session.stdinOnTTY) { + PrintAndLogEx(INFO, "Press ENTER to continue or CTRL-C to cancel..."); + fflush(stdout); + while (kbd_enter_pressed() == false) { + msleep(100); + } + } } // If the device's boot is newer than the current flasher, we can suggest the user update the flasher. diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c index 85a2bbd03..24f18ef52 100644 --- a/client/src/proxmark3.c +++ b/client/src/proxmark3.c @@ -1073,7 +1073,6 @@ int main(int argc, char *argv[]) { char *port = NULL; uint32_t speed = 0; - pm3line_init(); char exec_name[100] = {0}; strncpy(exec_name, basename(argv[0]), sizeof(exec_name) - 1); @@ -1522,6 +1521,8 @@ int main(int argc, char *argv[]) { } */ + pm3line_init(); + #ifdef HAVE_GUI # if defined(_WIN32) || (defined(__MACH__) && defined(__APPLE__))