Unified code with xmrig-amd version

MoneroOcean · Jan 15, 2019 · 35a6110 · 35a6110
1 parent 189eda6
commit 35a6110
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/common/net/Client.cpp b/src/common/net/Client.cpp
@@ -342,7 +342,10 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
         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"];
 
         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())) {
         *code = 6;