Merge pull request #2725 from div72/diag-fix2

diag: fix researcher mode check
gridcoin-community · Dec 24, 2023 · 8874259 · 8874259
2 parents f44a4a5 + 6c15f77
commit 8874259
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/wallet/diagnose.h b/src/wallet/diagnose.h
@@ -147,7 +147,7 @@ class Diagnose
 
         m_hasEligibleProjects = researcher->Id().Which() == GRC::MiningId::Kind::CPID;
         m_hasPoolProjects = researcher->Projects().ContainsPool();
-        m_researcher_mode = !(configured_for_investor_mode || (!m_hasEligibleProjects && m_hasPoolProjects));
+        m_researcher_mode = !(configured_for_investor_mode || (!m_hasEligibleProjects && !m_hasPoolProjects));
     }
 
     /**
@@ -532,15 +532,16 @@ class VerifyCPIDHasRAC : public Diagnose
          */
 
         const GRC::BeaconRegistry& beacons = GRC::GetBeaconRegistry();
-        const GRC::CpidOption cpid = GRC::Researcher::Get()->Id().TryCpid();
-        if (const GRC::BeaconOption beacon = beacons.Try(*cpid)) {
-            if (!beacon->Expired(GetAdjustedTime())) {
-                return true;
-            }
-            for (const auto& beacon_ptr : beacons.FindPending(*cpid)) {
-                if (!beacon_ptr->Expired(GetAdjustedTime())) {
+        if (const GRC::CpidOption cpid = GRC::Researcher::Get()->Id().TryCpid()) {
+            if (const GRC::BeaconOption beacon = beacons.Try(*cpid)) {
+                if (!beacon->Expired(GetAdjustedTime())) {
                     return true;
                 }
+                for (const auto& beacon_ptr : beacons.FindPending(*cpid)) {
+                    if (!beacon_ptr->Expired(GetAdjustedTime())) {
+                        return true;
+                    }
+                }
             }
         }
         return false;