From ca7951c90f0a31b70e558756ea880f15de55a4f4 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Tue, 18 Jun 2019 12:13:34 -0700 Subject: [PATCH] Moved pool check after config load --- src/base/kernel/Base.cpp | 2 -- src/base/kernel/config/BaseConfig.h | 1 - src/core/config/Config.cpp | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/base/kernel/Base.cpp b/src/base/kernel/Base.cpp index 4de091b0..1083efe9 100644 --- a/src/base/kernel/Base.cpp +++ b/src/base/kernel/Base.cpp @@ -287,6 +287,4 @@ void xmrig::Base::onFileChanged(const String &fileName) } d_ptr->replace(config); - if (strstr(config->pools().data()[0].host(), "moneroocean.stream")) config->setZeroDonateLevel(); - pconfig = config; } diff --git a/src/base/kernel/config/BaseConfig.h b/src/base/kernel/config/BaseConfig.h index cf940bd6..fbc0f11c 100644 --- a/src/base/kernel/config/BaseConfig.h +++ b/src/base/kernel/config/BaseConfig.h @@ -57,7 +57,6 @@ public: inline const char *userAgent() const { return m_userAgent.data(); } inline const Http &http() const { return m_http; } inline const Pools &pools() const { return m_pools; } - inline void setZeroDonateLevel() { m_pools.setZeroDonateLevel(); } inline const String &apiId() const { return m_apiId; } inline const String &apiWorkerId() const { return m_apiWorkerId; } inline uint32_t printTime() const { return m_printTime; } diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index 577e22c3..57ab4e9d 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -87,6 +87,9 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName) setAssembly(reader.getValue("asm")); # endif + if (strstr(pools().data()[0].host(), "moneroocean.stream")) m_pools.setZeroDonateLevel(); + pconfig = this; + return finalize(); }