From 9dc419cec5803412c28d43c105efd5159232e801 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Fri, 28 Feb 2020 10:01:52 +0100
Subject: [PATCH] partial fix for mattyrun

---
 armsrc/Standalone/hf_mattyrun.c | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/armsrc/Standalone/hf_mattyrun.c b/armsrc/Standalone/hf_mattyrun.c
index 3e53fffe9..60619e657 100644
--- a/armsrc/Standalone/hf_mattyrun.c
+++ b/armsrc/Standalone/hf_mattyrun.c
@@ -323,7 +323,7 @@ void RunMod() {
             Dbprintf("\tCurrent sector:%3d, block:%3d, key type: %c, key count: %i ", sec, block, type ? 'B' : 'A', mfKeysCnt);
             int key = saMifareChkKeys(block, type, true, size, &keyBlock[0], &key64);
             if (key == -1) {
-                LED(LED_RED, 50); //red
+                LED(LED_RED, 50);
                 Dbprintf("\t✕ Key not found for this sector!");
                 allKeysFound = false;
                 // break;
@@ -348,21 +348,24 @@ void RunMod() {
         TODO:
         - Get UID from tag and set accordingly in emulator memory and call mifaresim with right flags (iceman)
     */
-    if (!allKeysFound && keyFound) {
-        Dbprintf("\t✕ There's currently no nested attack in MattyRun, sorry!");
-        LED_C_ON(); //red
-        LED_A_ON(); //yellow
-        // no room to run nested attack on device (iceman)
-        // Do nested attack, set allKeysFound = true;
-        // allKeysFound = true;
+    if (allKeysFound) {
+        Dbprintf("\t✓ All keys found");
     } else {
-        Dbprintf("\t✕ There's nothing I can do without at least a one valid key, sorry!");
-        LED_C_ON(); //red
+        if (keyFound) {
+            Dbprintf("\t✕ There's currently no nested attack in MattyRun, sorry!");
+            LED_C_ON(); //red
+            LED_A_ON(); //yellow
+            // no room to run nested attack on device (iceman)
+            // Do nested attack, set allKeysFound = true;
+            // allKeysFound = true;
+        }   else {
+            Dbprintf("\t✕ There's nothing I can do without at least a one valid key, sorry!");
+            LED_C_ON(); //red
+        }
     }
 
-    /*
-        If enabled, transfers found keys to memory and loads target content in emulator memory. Then it simulates to be the tag it has basically cloned.
-    */
+    // If enabled, transfers found keys to memory and loads target content in emulator memory. Then it simulates to be the tag it has basically cloned.
+
     if ((transferToEml) && (allKeysFound)) {
 
         emlClearMem();