Merge #17971: refactor: Remove redundant conditional

e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a refactor: Remove redundant conditional (Bushstar)

Pull request description:

  Conditional check against fMaster is now redundant as it is already checked as true. This originally made sense as the outer conditional was:

  f9cae832e6/src/checkqueue.h (L86)

  Removal of fQuit happened in the commit below.

  30ded3e3d8 (diff-88316c9aa9514c038c9304297e672da5)

ACKs for top commit:
  theStack:
    ACK e80317be5f
  hebasto:
    ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a, I have reviewed the code, and it looks OK, I agree it can be merged.
  promag:
    ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a.
  emilengler:
    re-ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a
  practicalswift:
    ACK e80317be5fc6f6a04ea3b35bfe9991b3a5d29f7a
  Empact:
    ACK e80317be5f

Tree-SHA512: 136ea1d02e3d65100a8758730617ccede7864e08e8404e42e65d45d4bf95a3bfea2ab9895c6e8833abd654557d3efbba02b25297a2a5eefc36a11e97bbe9134f
This commit is contained in:
fanquake 2020-01-29 20:02:35 +08:00 committed by Pasta
parent 1b5ea905a3
commit 79bdf2c3bd
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -92,8 +92,7 @@ private:
nTotal--;
bool fRet = fAllOk;
// reset the status for new work later
if (fMaster)
fAllOk = true;
fAllOk = true;
// return the current status
return fRet;
}