From 703529b81c6f826e80daa262dc23dd59ffc077b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20Gr=C3=A4f?= Date: Sun, 27 Jan 2019 11:05:28 +0100 Subject: [PATCH] Fixed #228 ForcePow overrules autodetect for XTLv9/Fast2 - CN-Ultralite is displayed as "turtle" instead of "2" on Dashboard --- src/net/Job.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/net/Job.cpp b/src/net/Job.cpp index 428bc882..9835974c 100644 --- a/src/net/Job.cpp +++ b/src/net/Job.cpp @@ -139,7 +139,7 @@ bool Job::setTarget(const char *target) PowVariant Job::powVariant() const { if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_ULTRALITE) { - return PowVariant::POW_V2; + return PowVariant::POW_TURTLE; } if (m_powVariant == PowVariant::POW_AUTODETECT) { @@ -151,12 +151,16 @@ PowVariant Job::powVariant() const return PowVariant::POW_V0; } } else if (m_powVariant == PowVariant::POW_XTL) { - if (m_blob[0] >= 9) { - return PowVariant::POW_FAST_2; + if (!Options::i()->forcePowVariant()) { + if (m_blob[0] >= 9) { + return PowVariant::POW_FAST_2; + } } } else if (m_powVariant == PowVariant::POW_MSR) { - if (m_blob[0] >= 8) { - return PowVariant::POW_FAST_2; + if (!Options::i()->forcePowVariant()) { + if (m_blob[0] >= 8) { + return PowVariant::POW_FAST_2; + } } }