From f9b5377fd07685592758eb54369a779bef7dae66 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 8 Oct 2016 19:14:09 +0200
Subject: [PATCH] CHG:  reordered the "hf search" internal checks.  The iclass
 check takes 4.5sec to time-out...Incredible slow to identify.

---
 client/cmdhf.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 44ad9700..031f065e 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -874,35 +874,34 @@ int CmdHFSearch(const char *Cmd){
 	
 	PrintAndLog("");
 	int ans = CmdHF14AReader("s");
-
 	if (ans > 0) {
 		PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
 		return ans;
 	} 
-	ans = CmdHF14BReader("s");
+	ans = HF14BReader(false); //CmdHF14BReader("s");
 	if (ans) {
 		PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
 		return ans;
 	}
-	ans = HFiClassReader("", false, false);
-	if (ans) {
-		PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
-		return ans;
-	}
 	ans = HF15Reader("", false);
 	if (ans) {
 		PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
 		return ans;
 	}
+	ans = HFLegicReader("", false);
+	if ( ans == 0) {
+		PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
+		return 1;
+	}
 	ans = CmdHFTopazReader("s");
 	if (ans == 0) {
 		PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
 		return 1;
 	}
-	ans = HFLegicReader("", false);
-	if ( ans == 0) {
-		PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
-		return 1;
+	ans = HFiClassReader("", false, false);
+	if (ans) {
+		PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
+		return ans;
 	}
 	
 	PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
-- 
2.39.5