From a97a21a2fa8f16d557bb967378a2636ccc2b5442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20Gr=C3=A4f?= Date: Wed, 6 Mar 2019 20:10:49 +0100 Subject: [PATCH] Fixed coloring of outdated version on Dashboard Integrated Auto detect for V4, RWZ and Zelerius forls --- index.html | 4 ++++ src/net/Job.cpp | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 22037a59..f901c6c8 100644 --- a/index.html +++ b/index.html @@ -412,6 +412,10 @@ currentVersion = currentVersion * 10; } + if (latestVersion < 1000) { + latestVersion = latestVersion * 10; + } + if (latestVersion > currentVersion) { $("#updateNotificationBar").html('
' + '×' + diff --git a/src/net/Job.cpp b/src/net/Job.cpp index 4f162d00..b0759113 100644 --- a/src/net/Job.cpp +++ b/src/net/Job.cpp @@ -144,7 +144,9 @@ PowVariant Job::powVariant() const } if (m_powVariant == PowVariant::POW_AUTODETECT) { - if (m_blob[0] > 7) { + if (m_blob[0] >= 10) { + return PowVariant::POW_V4; + } else if (m_blob[0] > 7) { return PowVariant::POW_V2; } else if (m_blob[0] > 6) { return PowVariant::POW_V1; @@ -163,6 +165,18 @@ PowVariant Job::powVariant() const return PowVariant::POW_FAST_2; } } + } else if (m_powVariant == PowVariant::POW_RWZ) { + if (!Options::i()->forcePowVariant()) { + if (m_blob[0] < 12) { + return PowVariant::POW_V2; + } + } + } else if (m_powVariant == PowVariant::POW_ZELERIUS) { + if (!Options::i()->forcePowVariant()) { + if (m_blob[0] < 8) { + return PowVariant::POW_V2; + } + } } return m_powVariant;