Browse Source

Merge commit '64ffc59' into bfgminer-2.9.x

Luke Dashjr 13 years ago
parent
commit
836b05514c
1 changed files with 3 additions and 2 deletions
  1. 3 2
      miner.c

+ 3 - 2
miner.c

@@ -7855,7 +7855,7 @@ int main(int argc, char *argv[])
 			sprintf(pool->rpc_userpass, "%s:%s", pool->rpc_user, pool->rpc_pass);
 			sprintf(pool->rpc_userpass, "%s:%s", pool->rpc_user, pool->rpc_pass);
 		}
 		}
 	}
 	}
-	/* Set the currentpool to pool wiht priority 0 */
+	/* Set the currentpool to pool with priority 0 */
 	validate_pool_priorities();
 	validate_pool_priorities();
 	for (i = 0; i < total_pools; i++) {
 	for (i = 0; i < total_pools; i++) {
 		struct pool *pool  = pools[i];
 		struct pool *pool  = pools[i];
@@ -7934,7 +7934,7 @@ int main(int argc, char *argv[])
 						currentpool = pool;
 						currentpool = pool;
 					applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url);
 					applog(LOG_INFO, "Pool %d %s active", pool->pool_no, pool->rpc_url);
 					pools_active = true;
 					pools_active = true;
-					break;
+					goto found_active_pool;
 				} else {
 				} else {
 					if (pool == currentpool)
 					if (pool == currentpool)
 						currentpool = NULL;
 						currentpool = NULL;
@@ -7966,6 +7966,7 @@ int main(int argc, char *argv[])
 				quit(0, "No servers could be used! Exiting.");
 				quit(0, "No servers could be used! Exiting.");
 		}
 		}
 	} while (!pools_active);
 	} while (!pools_active);
+found_active_pool: ;
 
 
 #ifdef USE_SCRYPT
 #ifdef USE_SCRYPT
 	if (detect_algo == 1 && !opt_scrypt) {
 	if (detect_algo == 1 && !opt_scrypt) {