Merge eda6689 into 3655f65

worr · Apr 10, 2017 · d3f31e2 · d3f31e2
2 parents 3655f65 + eda6689
commit d3f31e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -3,4 +3,4 @@ wsh was made possible by
 * William Orr <will@worrbase.com> - core
 * Matt Gambogi <m@gambogi.com> - site
 * Ross Delinger <rossdylan@csh.rit.edu> - test compat
-* Pradeep Sanders <psanders@linkedin.com> - --no-shell
+* Pradeep Sanders <psanders@ultraviolet.us> - --no-shell
diff --git a/client/src/main.c b/client/src/main.c
@@ -351,14 +351,16 @@ int main(int argc, char** argv) {
 		return EXIT_FAILURE;
 	}
 
+	if (threads == 0) {
 #ifdef HAVE_G_GET_NUM_PROCESSORS
-	threads = g_get_num_processors();
+		threads = g_get_num_processors();
 #else
-	threads = 12;
+		threads = 12;
 #endif
+	}
 
 	wsh_log_client_cmd(req.cmd_string, req.username, hosts, req.cwd);
-	if (num_hosts == 1 || threads == 0) {
+	if (num_hosts == 1 || threads < 2) {
 		for (gint i = 0; i < num_hosts; i++) {
 			wsh_cmd_res_t* res = NULL;