diff options
| author | psychocrypt <psychocryptHPC@gmail.com> | 2017-12-25 21:41:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-25 21:41:32 +0100 |
| commit | 046c2589f8903c3fb58e29c43fa409f7d30ce3f2 (patch) | |
| tree | 153a7c093eb40c1bab3816a572a979b5551ed822 /xmrstak/jconf.cpp | |
| parent | 52c305796127258f29d119843e86906541ea27b3 (diff) | |
| parent | 9201a73269ad057d93d7c850aa68336b264f5468 (diff) | |
| download | xmr-stak-046c2589f8903c3fb58e29c43fa409f7d30ce3f2.zip xmr-stak-046c2589f8903c3fb58e29c43fa409f7d30ce3f2.tar.gz | |
Merge pull request #701 from fireice-uk/topic-http-cli
Add option to enable web interface from cli
Diffstat (limited to 'xmrstak/jconf.cpp')
| -rw-r--r-- | xmrstak/jconf.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp index f279f52..a1db451 100644 --- a/xmrstak/jconf.cpp +++ b/xmrstak/jconf.cpp @@ -242,7 +242,10 @@ uint64_t jconf::GetAutohashTime() uint16_t jconf::GetHttpdPort() { - return prv->configValues[iHttpdPort]->GetUint(); + if(xmrstak::params::inst().httpd_port == xmrstak::params::httpd_port_unset) + return prv->configValues[iHttpdPort]->GetUint(); + else + return uint16_t(xmrstak::params::inst().httpd_port); } const char* jconf::GetHttpUsername() |
