summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpsychocrypt <psychocrypt@users.noreply.github.com>2017-11-29 20:52:00 +0100
committerGitHub <noreply@github.com>2017-11-29 20:52:00 +0100
commitbd8d84a62f4a48580edae69ce649959237f874f4 (patch)
treed21ad254be0968a876c93115e601834e3ff22fdd
parentc2d76ae6f5b0ec82095f1b993c07e149dea90df0 (diff)
parent01236f83fc30695218a4e0b0228cc58194b9ac74 (diff)
downloadxmr-stak-bd8d84a62f4a48580edae69ce649959237f874f4.zip
xmr-stak-bd8d84a62f4a48580edae69ce649959237f874f4.tar.gz
Merge pull request #291 from fireice-uk/topic-clearer-dev-switch
Add custom message for dev -> user pool switch
-rw-r--r--xmrstak/misc/executor.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index ca78c61..f7e6311 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -388,10 +388,16 @@ void executor::on_pool_have_job(size_t pool_id, pool_job& oPoolJob)
if(dat.pool_id != pool_id)
{
- if(dat.pool_id == invalid_pool_id)
- printer::inst()->print_msg(L2, "Pool logged in.");
+ jpsock* prev_pool;
+ if(dat.pool_id != invalid_pool_id && (prev_pool = pick_pool_by_id(dat.pool_id)) != nullptr)
+ {
+ if(prev_pool->is_dev_pool())
+ printer::inst()->print_msg(L2, "Switching back to user pool.");
+ else
+ printer::inst()->print_msg(L2, "Pool switched.");
+ }
else
- printer::inst()->print_msg(L2, "Pool switched.");
+ printer::inst()->print_msg(L2, "Pool logged in.");
}
else
printer::inst()->print_msg(L3, "New block detected.");
OpenPOWER on IntegriCloud