Merge commit 'a4772ea' into bfgminer

miner.c

@@ -8695,7 +8695,10 @@ retry_stratum:
 				init_stratum_thread(pool);
 			}
 			else
+			{
 				pool_tclear(pool, &pool->stratum_init);
+				pool->tv_idle = tv_getwork_reply;
+			}
 			return ret;
 		}
 		return pool->stratum_active;
@@ -8739,6 +8742,7 @@ badwork:
 			pool->proto = proto = pool_protocol_fallback(proto);
 			if (PLP_NONE != proto)
 				goto tryagain;
+			pool->tv_idle = tv_getwork_reply;
 			free_work(work);
 			goto out;
 		}
@@ -8786,6 +8790,7 @@ badwork:
 		pool->proto = proto;
 		goto tryagain;
 	} else {
+		pool->tv_idle = tv_getwork_reply;
 		free_work(work);
 nohttp:
 		/* If we failed to parse a getwork, this could be a stratum