From 772e2ac33fc45b9284fe84f7e5f00b809b0135b7 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Mon, 27 Jun 2016 08:54:45 +0200 Subject: [PATCH] Fix benchmark devices_status bug --- src/hashcat.c | 14 ++++++++++++-- src/shared.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 202bd7316..8f899379d 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -18236,6 +18236,16 @@ int main (int argc, char **argv) data.devices_status = STATUS_RUNNING; } + // and overwrite benchmark aborts as well + + if (data.benchmark == 1) + { + if (data.devices_status == STATUS_ABORTED) + { + data.devices_status = STATUS_RUNNING; + } + } + // finalize task if (data.devices_status == STATUS_CRACKED) break; @@ -18406,7 +18416,7 @@ int main (int argc, char **argv) #ifdef HAVE_HWMON if (gpu_temp_disable == 0) { - if (gpu_temp_retain != 0) // VENDOR_ID_AMD is implied here + if (gpu_temp_retain != 0) { hc_thread_mutex_lock (mux_adl); @@ -18445,7 +18455,7 @@ int main (int argc, char **argv) // reset power tuning - if (powertune_enable == 1) // VENDOR_ID_AMD is implied here + if (powertune_enable == 1) { hc_thread_mutex_lock (mux_adl); diff --git a/src/shared.c b/src/shared.c index 026af2999..ba344585f 100644 --- a/src/shared.c +++ b/src/shared.c @@ -20737,7 +20737,7 @@ BOOL WINAPI sigHandler_benchmark (DWORD sig) { case CTRL_CLOSE_EVENT: - myabort (); + myquit (); SetConsoleCtrlHandler (NULL, TRUE);