Merge commit 'ea444d0' into scrypt

Conflicts:
	miner.c

findnonce.c

@@ -235,7 +235,7 @@ static void *postcalc_hash(void *userdata)
 		if (pcd->res[entry]) {
 #ifdef USE_SCRYPT
 			if (opt_scrypt)
-				submit_nonce(thr, pcd->work, entry);
+				submit_nonce(thr, pcd->work, pcd->res[entry]);
 			else
 #endif
 				send_nonce(pcd, pcd->res[entry]);

miner.c

@@ -4334,14 +4334,14 @@ bool hashtest(const struct work *work, bool checktarget)
 
 bool test_nonce(struct work *work, uint32_t nonce, bool checktarget)
 {
-	if (opt_scrypt)
-		return true;
-
 	work->data[64 + 12 + 0] = (nonce >> 0) & 0xff;
 	work->data[64 + 12 + 1] = (nonce >> 8) & 0xff;
 	work->data[64 + 12 + 2] = (nonce >> 16) & 0xff;
 	work->data[64 + 12 + 3] = (nonce >> 24) & 0xff;
 
+	if (opt_scrypt)
+		return true;
+
 	return hashtest(work, checktarget);
 }