Merge remote-tracking branch 'remotes/origin/dev' into evo
This commit is contained in:
commit
b8191cef2b
2 changed files with 7 additions and 1 deletions
2
src/base
2
src/base
|
@ -1 +1 @@
|
|||
Subproject commit 8fb0d855bc814d876fcffb2b3d8028c56467da99
|
||||
Subproject commit ff3cb7bdc3b1660efba76a31e08e0ec0514de815
|
|
@ -561,6 +561,12 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
|
|||
const uint8_t index = donate ? 1 : 0;
|
||||
|
||||
d_ptr->reset = !(d_ptr->job.index() == 1 && index == 0 && d_ptr->userJobId == job.id());
|
||||
|
||||
// Don't reset nonce if pool sends the same hashing blob again, but with different difficulty (for example)
|
||||
if (d_ptr->job.isEqualBlob(job)) {
|
||||
d_ptr->reset = false;
|
||||
}
|
||||
|
||||
d_ptr->job = job;
|
||||
d_ptr->job.setIndex(index);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue