X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/643fb10b2df5248f830f0a9e3d8ae43b24e1c2b2..9aeda6cbfbfadd3be02f43165617b1ec4ff45425:/client/graph.c?ds=sidebyside

diff --git a/client/graph.c b/client/graph.c
index ae318ddf..c22b7a3d 100644
--- a/client/graph.c
+++ b/client/graph.c
@@ -53,12 +53,13 @@ void save_restoreGB(uint8_t saveOpt)
 	static bool GB_Saved = false;
 
 	if (saveOpt==1) { //save
-		memcpy(SavedGB,GraphBuffer, sizeof(GraphBuffer));
+		memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
 		SavedGBlen = GraphTraceLen;
 		GB_Saved=true;
-	} else if (GB_Saved){
-		memcpy(GraphBuffer,SavedGB, sizeof(GraphBuffer));
+	} else if (GB_Saved){ //restore
+		memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
 		GraphTraceLen = SavedGBlen;
+		RepaintGraphWindow();
 	}
 	return;
 }
@@ -142,10 +143,14 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
 			PrintAndLog("Failed to copy from graphbuffer");
 		return -1;
 	}
-	DetectASKClock(grph, size, &clock, 20);
+	bool st = DetectST(grph, &size, &clock);
+	int start = 0;
+	if (st == false) {
+		start = DetectASKClock(grph, size, &clock, 20);
+	}
 	// Only print this message if we're not looping something
 	if (printAns){
-		PrintAndLog("Auto-detected clock rate: %d", clock);
+		PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
 	}
 	return clock;
 }