From e46a2a508a9686429f2661a4338a38b32fc29c95 Mon Sep 17 00:00:00 2001 From: XMRig Date: Thu, 18 Apr 2019 00:25:37 +0700 Subject: [PATCH 1/2] v2.15.2-beta --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 0f5a456a..60080720 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.15.2-evo" +#define APP_VERSION "2.15.2-beta" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" From 8b0d35b61922c28651a239360298c5a890edf66e Mon Sep 17 00:00:00 2001 From: XMRig Date: Thu, 18 Apr 2019 15:23:36 +0700 Subject: [PATCH 2/2] #1014 Fixed regression, default value for `algo` option was not applied. --- CHANGELOG.md | 3 +++ src/base/kernel/config/BaseConfig.cpp | 2 +- src/version.h | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4eb3a07..4655cf34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v2.15.3-beta +- [#1014](https://github.com/xmrig/xmrig/issues/1014) Fixed regression, default value for `algo` option was not applied. + # v2.15.2-beta - [#1010](https://github.com/xmrig/xmrig/pull/1010#issuecomment-482632107) Added daemon support (solo mining). - [#1012](https://github.com/xmrig/xmrig/pull/1012) Fixed compatibility with clang 9. diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp index b2166240..af2418aa 100644 --- a/src/base/kernel/config/BaseConfig.cpp +++ b/src/base/kernel/config/BaseConfig.cpp @@ -160,7 +160,7 @@ bool xmrig::BaseConfig::read(const IJsonReader &reader, const char *fileName) m_http.load(chain.getObject("http")); # endif - m_algorithm.parseAlgorithm(reader.getString("algo")); + m_algorithm.parseAlgorithm(reader.getString("algo", "cn")); m_pools.load(reader.getArray("pools")); m_pools.setDonateLevel(reader.getInt("donate-level", kDefaultDonateLevel)); diff --git a/src/version.h b/src/version.h index 60080720..0c9b970a 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.15.2-beta" +#define APP_VERSION "2.15.3-beta" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" @@ -36,7 +36,7 @@ #define APP_VER_MAJOR 2 #define APP_VER_MINOR 15 -#define APP_VER_PATCH 2 +#define APP_VER_PATCH 3 #ifdef _MSC_VER # if (_MSC_VER >= 1910)