Semi-Merge commit '8b2118b' into cg_merges_20130524b (leave quit as printf-style)

miner.c

@@ -3401,6 +3401,7 @@ tryagain:
 static void disable_curses(void)
 {
 	if (curses_active_locked()) {
+		use_curses = false;
 		curses_active = false;
 		leaveok(logwin, false);
 		leaveok(statuswin, false);
@@ -7898,12 +7899,15 @@ void print_summary(void)
 		log_print_status(cgpu);
 	}
 
-	if (opt_shares)
+	if (opt_shares) {
 		applog(LOG_WARNING, "Mined %d accepted shares of %d requested\n", total_accepted, opt_shares);
-	fflush(stdout);
+		if (opt_shares > total_accepted)
+			applog(LOG_WARNING, "WARNING - Mined only %d shares of %d requested.", total_accepted, opt_shares);
+	}
+	applog(LOG_WARNING, "");
+
 	fflush(stderr);
-	if (opt_shares > total_accepted)
-		applog(LOG_WARNING, "WARNING - Mined only %d shares of %d requested.", total_accepted, opt_shares);
+	fflush(stdout);
 }
 
 static void clean_up(void)