mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-12 01:42:48 -05:00
Code Issues Projects Releases Wiki Activity

Unified code with xmrig-amd version

Browse Source
This commit is contained in:
MoneroOcean
2019-01-15 15:33:06 -08:00
parent 189eda6467
commit 35a611030a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/net/Client.cpp
View File

@@ -342,7 +342,10 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
return false; return false;
} }
if (params.HasMember("variant")) { if (params.HasMember("algo")) {
job.setAlgorithm(params["algo"].GetString());
}
else if (params.HasMember("variant")) {
const rapidjson::Value &variant = params["variant"]; const rapidjson::Value &variant = params["variant"];
if (variant.IsInt()) { if (variant.IsInt()) {
@@ -353,11 +356,6 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
} }
} }
// moved algo after variant parsing to override variant that is considered to be outdated now
if (params.HasMember("algo")) {
job.setAlgorithm(params["algo"].GetString());
}
if (!verifyAlgorithm(job.algorithm())) { if (!verifyAlgorithm(job.algorithm())) {
*code = 6; *code = 6;