Merge branch 'patch-1' of https://github.com/nopeinomicon/xmrig into nopeinomicon-patch-1

This commit is contained in:
XMRig 2020-11-02 12:59:36 +07:00
commit e295a938f8
No known key found for this signature in database
GPG key ID: 446A53638BE94409

View file

@ -136,6 +136,18 @@ private:
if (read(chain, config)) { if (read(chain, config)) {
return config.release(); return config.release();
} }
chain.addFile(Process::location(Process::HomeLocation, ".xmrig.json"));
if (read(chain, config)) {
return config.release();
}
chain.addFile(Process::location(Process::HomeLocation, ".config/xmrig.json"));
if (read(chain, config)) {
return config.release();
}
# ifdef XMRIG_FEATURE_EMBEDDED_CONFIG # ifdef XMRIG_FEATURE_EMBEDDED_CONFIG
chain.addRaw(default_config); chain.addRaw(default_config);