Merge branch 'master' into allin

update 201119
2020-11-19 23:21:19 +01:00
parent 56efc8adec 177fcbe4ca
commit e642c05e5c
9 changed files with 259 additions and 164 deletions
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -2082,9 +2082,10 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
            if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {
                if (DBGLEVEL >= DBG_ERROR) Dbprintf("Can't select card");
                errormsg = MAGIC_UID;
+                mifare_classic_halt_ex(NULL);
+                break;
            }
            mifare_classic_halt_ex(NULL);
-            break;
        }

        // wipe tag, fill it with zeros