diff --git a/BuildInfo.h b/BuildInfo.h
index d146053..44fa0ca 100644
--- a/BuildInfo.h
+++ b/BuildInfo.h
@@ -1,6 +1,6 @@
#pragma once
#define RH_PROJECT_NAME "rhminer"
-#define RH_PROJECT_VERSION "1.5.1"
+#define RH_PROJECT_VERSION "1.5.2"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b09121..ab13c74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# rhminer update and bugfix history
+Version 1.5.2 - 16 May 2019
+* Fixed Xml parsing of config file. Some options where skipped.
+
+
Version 1.5.1 - 14 May 2019
* Support for CUDA 10.1 with drivers 419.x(Windows) and 418.x(Linux)
* Added suppot for Nvidia Turing architecture (GTX 20xx) Untested.
diff --git a/README.md b/README.md
index 0f22da4..75fa8a0 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Support stratum and solo mining
Works on Windows 7,10 and Ubuntu 18
## Download prebuilt binaries
-**Current version is 1.5.1**
+**Current version is 1.5.2**
There is one prebuilt binariy per OS and CUDA architectures.
https://github.com/polyminer1/rhminer/releases/
@@ -26,7 +26,7 @@ To get the number of logical cores, on you system, simply run rhminer with the -
```
C:\rhminer>rhminer -completelist
- rhminer v1.5.1 beta for CPU by polyminer1 (https://github.com/polyminer1/rhminer)
+ rhminer v1.5.2 beta for CPU by polyminer1 (https://github.com/polyminer1/rhminer)
Buid CPU Nov 19 2018 20:04:01
Donations : Pascal account 529692-23
diff --git a/Release/config.txt b/Release/config.txt
index 62b2bc1..8f5614a 100644
--- a/Release/config.txt
+++ b/Release/config.txt
@@ -132,7 +132,7 @@ WARNING: Changing this value will affect GPU mining.
Log verbosity. From 0 to 3.
0 no log, 1 normal log, 2 include warnings. 3 network (only in log file).
Default is 1
-/*
+*/
"v":3,
diff --git a/rhminer/CommandLineManager.cpp b/rhminer/CommandLineManager.cpp
index 9b2b6e2..f931ff8 100644
--- a/rhminer/CommandLineManager.cpp
+++ b/rhminer/CommandLineManager.cpp
@@ -264,17 +264,19 @@ bool CmdLineManager::Parse(int argc, char** argv, bool exitOnError)
m_argslist += " ";
}
- //DebugOut("Command line args : %s\n", m_argslist.c_str());
int res = ParseInternal(NULL, exitOnError);
if (res && exitOnError)
{
printf("Invalid command line option '%s'\n", res < argc ? argv[res]:"");
RHMINER_EXIT_APP("");
}
+
+ PrintOutSilent("Options: %s\n", m_argslist.c_str());
+
return res == 0;
}
-//return ith symbole that cause error. else return 0
+//return ith symbol that cause error. else return 0
int CmdLineManager::ParseInternal(const char* specificSymbol, bool exitOnError)
{
if (!m_xmlCommandLineConfig.empty())
@@ -300,13 +302,12 @@ int CmdLineManager::ParseInternalXML(const char* specificSymbol, bool exitOnErro
if (o)
{
if (o->parsed && !o->allowMultiples)
- return 0;
+ continue;
string symbVal = m_xmlCommandLineConfig.get(symb, "").asString();
+ //PrintOut("XML option %s '%s'\n", symb.c_str(), symbVal.c_str());
if (symbVal.length())
{
- //printf("XML option %s %s\n", symb.c_str(), symbVal.c_str());
-
if (o->flagSetter)
{
if (stristr(symbVal.c_str(), "enable") || stristr(symbVal.c_str(), "true"))
@@ -357,7 +358,7 @@ int CmdLineManager::ParseInternalXML(const char* specificSymbol, bool exitOnErro
return 0;
}
- if (m_argslist.length())
+ if (m_argslist.length() && !specificSymbol)
OverrideArgs(m_argslist);
return 0;