1 files changed, 28 insertions, 7 deletions

diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index f7e6311..6f34d80 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -528,6 +528,30 @@ void executor::ex_main()
 			pools.emplace_front(0, "donate.xmr-stak.net:4444", "", "", 0.0, true, false, "", true);
 	}
 
+	/* find the pool with the highest weighting to allow overwriting of the
+	 * pool settings via command line options.
+	 */
+	std::vector<jpsock*> sorted_pools;
+	sorted_pools.reserve(pools.size());
+	for(jpsock& pool : pools)
+		sorted_pools.emplace_back(&pool);
+	std::sort(sorted_pools.begin(), sorted_pools.end(), [](jpsock* a, jpsock* b) { return b->get_pool_weight(true) < a->get_pool_weight(true); });
+
+ 	// overwrite pool address if cli option is used
+	auto& poolURL = xmrstak::params::inst().poolURL;	
+	if(!poolURL.empty())
+	{
+		sorted_pools[0]->set_pool_addr(poolURL.c_str());
+	}
+	// overwrite user pool login name if cli option is used
+	auto& poolUsername = xmrstak::params::inst().poolUsername;
+	if(!poolUsername.empty())
+		sorted_pools[0]->set_user_login(poolUsername.c_str());
+	// overwrite user pool login password if cli option is used
+	auto& poolPasswd = xmrstak::params::inst().poolPasswd;
+	if(!poolPasswd.empty())
+		sorted_pools[0]->set_user_passwd(poolPasswd.c_str());
+
 	ex_event ev;
 	std::thread clock_thd(&executor::ex_clock_thd, this);
 
@@ -631,14 +655,11 @@ inline const char* hps_format(double h, char* buf, size_t l)
 {
 	if(std::isnormal(h) || h == 0.0)
 	{
-		if(h < 10.0)
-			snprintf(buf, l, "  %03.1f", h);
-		else
-			snprintf(buf, l, " %04.1f", h);
+		snprintf(buf, l, " %6.1f", h);
 		return buf;
 	}
 	else
-		return " (na)";
+		return "   (na)";
 }
 
 bool executor::motd_filter_console(std::string& motd)
@@ -732,9 +753,9 @@ void executor::hashrate_report(std::string& out)
 			std::transform(name.begin(), name.end(), name.begin(), ::toupper);
 			
 			out.append("HASHRATE REPORT - ").append(name).append("\n");
-			out.append("| ID |  10s |  60s |  15m |");
+			out.append("| ID |    10s |    60s |    15m |");
 			if(nthd != 1)
-				out.append(" ID |  10s |  60s |  15m |\n");
+				out.append(" ID |    10s |    60s |    15m |\n");
 			else
 				out.append(1, '\n');