From 08768424f0ed049f971e9dd8c04df7f8ce8b42e7 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Wed, 3 Oct 2018 13:54:58 -0600
Subject: [PATCH] Post Prime95 results for aborted tests

---
 .bin/Scripts/functions/hw_diags.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 090d2740..69958ba2 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -960,6 +960,9 @@ def run_mprime(ticket_number):
     except KeyboardInterrupt:
         # Catch CTRL+C
         aborted = True
+        TESTS['Prime95']['Status'] = 'Aborted'
+        print_warning('\nAborted.')
+        update_progress()
 
     # Save "final" temps
     run_program(
@@ -1007,15 +1010,7 @@ def run_mprime(ticket_number):
             TESTS['Prime95']['CS'] = bool(r)
 
     # Update status
-    if aborted:
-        TESTS['Prime95']['Status'] = 'Aborted'
-        print_warning('\nAborted.')
-        update_progress()
-        if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']:
-            if not ask('Proceed to next test?'):
-                run_program('tmux kill-pane -a'.split())
-                raise GenericError
-    else:
+    if not aborted:
         if TESTS['Prime95']['NS']:
             TESTS['Prime95']['Status'] = 'NS'
         elif TESTS['Prime95']['CS']:
@@ -1056,6 +1051,12 @@ def run_mprime(ticket_number):
             ticket_id=ticket_number,
             response='\n'.join(report))
 
+    if aborted:
+        if TESTS['NVMe/SMART']['Enabled'] or TESTS['badblocks']['Enabled']:
+            if not ask('Proceed to next test?'):
+                run_program('tmux kill-pane -a'.split())
+                raise GenericError
+
     # Done
     run_program('tmux kill-pane -a'.split())