summaryrefslogtreecommitdiffstats
path: root/xmrstak/misc/executor.cpp
diff options
context:
space:
mode:
authorpsychocrypt <psychocrypt@users.noreply.github.com>2017-11-16 20:24:50 +0100
committerGitHub <noreply@github.com>2017-11-16 20:24:50 +0100
commit214a00c63a1b47a0805b6d0315d91632ff4fca80 (patch)
tree6dc83776504cf3eab752b566503638fdb65ac901 /xmrstak/misc/executor.cpp
parent036ffa887272b0c27197f78a6082b903ace1a344 (diff)
parent0a20956b3f44a41566be18b55f47d96935b01202 (diff)
downloadxmr-stak-214a00c63a1b47a0805b6d0315d91632ff4fca80.zip
xmr-stak-214a00c63a1b47a0805b6d0315d91632ff4fca80.tar.gz
Merge pull request #127 from fireice-uk/fix-multipool
Fix cases where positive feedback was still occurring.
Diffstat (limited to 'xmrstak/misc/executor.cpp')
-rw-r--r--xmrstak/misc/executor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index dea1dab..ff5e94f 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -234,7 +234,7 @@ void executor::eval_pool_choice()
/* All is good - but check if we can do better */
std::sort(eval_pools.begin(), eval_pools.end(), [](jpsock* a, jpsock* b) { return b->get_pool_weight(false) < a->get_pool_weight(false); });
jpsock* goal2 = eval_pools[0];
-
+
if(goal->get_pool_id() != goal2->get_pool_id())
{
if(!goal2->is_running() && goal2->can_connect())
@@ -252,10 +252,10 @@ void executor::eval_pool_choice()
{
for(jpsock& pool : pools)
{
- if(goal->is_logged_in() && pool.is_running() && pool.get_pool_id() != goal->get_pool_id())
+ if(goal->is_logged_in() && pool.is_logged_in() && pool.get_pool_id() != goal->get_pool_id())
pool.disconnect(true);
- if(pool.is_dev_pool() && pool.is_running())
+ if(pool.is_dev_pool() && pool.is_logged_in())
pool.disconnect(true);
}
}
OpenPOWER on IntegriCloud