From: marshmellow42 <marshmellowrf@gmail.com>
Date: Sun, 16 Apr 2017 01:40:05 +0000 (-0400)
Subject: adjust lf search to not use save/restore if...
X-Git-Tag: v3.0.0~12^2~5
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/537f80f2c8a84c8d48e66af78ed28d96306b8d9f?ds=sidebyside;hp=-c

adjust lf search to not use save/restore if...

offline or '1' entered
this allows the graph restore button to continue functioning after a `lf
search 1`
---

537f80f2c8a84c8d48e66af78ed28d96306b8d9f
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 5c479ae0..b18cf215 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -877,19 +877,20 @@ int CmdVchDemod(const char *Cmd)
 int CheckChipType(char cmdp) {
 	uint32_t wordData = 0;
 
-	//check for em4x05/em4x69 chips first
+	if (offline || cmdp == '1') return 0;
+
 	save_restoreGB(1);
 	save_restoreDB(1);
-	if ((!offline && (cmdp != '1')) && EM4x05Block0Test(&wordData)) {
+	//check for em4x05/em4x69 chips first
+	if (EM4x05Block0Test(&wordData)) {
 		PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");
 		save_restoreGB(0);
 		save_restoreDB(0);
 		return 1;
 	}
 
-	//TODO check for t55xx chip...
-
-	if ((!offline && (cmdp != '1')) && tryDetectP1(true)) {
+	//check for t55xx chip...
+	if (tryDetectP1(true)) {
 		PrintAndLog("\nValid T55xx Chip Found\nTry lf t55xx ... commands\n");
 		save_restoreGB(0);
 		save_restoreDB(0);