Merge branch 'bug/sgminer-rpc-api-error'

nwoolls · Nov 6, 2014 · 01985d7 · 01985d7
2 parents ee194c1 + 899d5d9
commit 01985d7
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/MultiMiner.Xgminer.Api/Parsers/VersionInformationParser.cs b/MultiMiner.Xgminer.Api/Parsers/VersionInformationParser.cs
@@ -17,7 +17,20 @@ public static void ParseTextForVersionInformation(string text, MultiMiner.Xgmine
 
             keyValuePairs = GetDictionaryFromTextChunk(responseParts[1]);
 
-            versionInformation.MinerVersion = keyValuePairs["CGMiner"];
+            string key = "CGMiner";
+            if (keyValuePairs.ContainsKey(key))
+                versionInformation.MinerVersion = keyValuePairs[key];
+            else
+            {
+                // SGMiner 4.0 broke compatibility with the CGMiner RPC API
+                // Version 5.0 fixed the issue - this work-around is for 4.0
+                // Request :"version"
+                // Response:"STATUS=S,When=1415068731,Code=22,Msg=SGMiner versions,Description=sgminer 4.1.0|VERSION,SGMiner=4.1.0,API=3.1|\u0000"
+                key = "SGMiner";
+                if (keyValuePairs.ContainsKey(key))
+                    versionInformation.MinerVersion = keyValuePairs[key];
+            }
+
             versionInformation.ApiVersion = keyValuePairs["API"];
         }
     }