Merge commit 'e65a3b9' into bfgminer

NEWS

@@ -1,5 +1,6 @@
 BFGMiner Version 2.6.2 - Future
 
+- Scrypt mining does not support block testing yet so don't try to print it.
 - Clear the bitforce buffer whenever we get an unexpected result as it has
 likely throttled and we are getting cached responses out of order, and use the
 temperature monitoring as a kind of watchdog to flush unexpected results.

miner.c

@@ -1921,10 +1921,9 @@ static bool submit_upstream_work(const struct work *work, CURL *curl)
 
 	if (!QUIET) {
 		hash32 = (uint32_t *)(work->hash);
-		if (opt_scrypt) {
-			sprintf(hashshow, "%08lx.%08lx%s", (unsigned long)(hash32[7]), (unsigned long)(hash32[6]),
-				work->block? " BLOCK!" : "");
-		} else {
+		if (opt_scrypt)
+			sprintf(hashshow, "%08lx.%08lx", (unsigned long)(hash32[7]), (unsigned long)(hash32[6]));
+		else {
 			sprintf(hashshow, "%08lx.%08lx%s", (unsigned long)(hash32[6]), (unsigned long)(hash32[5]),
 				work->block? " BLOCK!" : "");
 		}