1 files changed, 25 insertions, 7 deletions

diff --git a/src/main.cpp b/src/main.cpp
index efff96c..77aba89 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -170,6 +170,26 @@ int MinerThreadCount()
     return (int)(nCores - 1);
 }
 
+// Hash threads one participant session runs.
+//
+// Explicit /hashthreads=N is honored exactly, including 1 -- a miner who says
+// one means one. Automatic leaves a core to the node, the Stratum I/O loop and
+// everything else the process still has to do, for the same reason
+// MinerThreadCount() does.
+//
+// Lives here, next to that function, because the two are easy to confuse and
+// StartMinerThreads() needs to be able to tell them apart: only ONE session
+// runs in participant mode, and this is what sizes it.
+int ParticipantHashThreadCount()
+{
+    if (nHashThreads > 0)
+        return nHashThreads;
+    int nWorkers = (int)AvailableCoreCount();
+    if (nWorkers < 2)
+        nWorkers = 2;
+    return nWorkers - 1;
+}
+
 bool AddKey(const CKey& key)
 {
     if (IsWalletEncrypted())
@@ -3828,13 +3848,11 @@ connected:
     // shared dataset), then run the I/O loop below: receive pool messages,
     // publish jobs to the threads, submit the shares they find.
     // ------------------------------------------------------------------
-    int nWorkers = nHashThreads > 0 ? nHashThreads
-                                    : (int)AvailableCoreCount();
-    if (nHashThreads <= 0) {
-        if (nWorkers < 2) nWorkers = 2;
-        nWorkers -= 1; // leave one core for node + I/O threads
-    }
-    // explicit /hashthreads=N is honored exactly (including 1)
+    // One count, decided in one place (main.cpp:MinerThreadCount's neighbour),
+    // so that what StartMinerThreads() reports at startup and what actually
+    // hashes here can never drift apart. Explicit /hashthreads=N is honored
+    // exactly, including 1; automatic leaves one core for node + I/O threads.
+    int nWorkers = ParticipantHashThreadCount();
     ParticipantJobShared jobShared;
     std::vector<ParticipantShareHit> shareHits;
     std::mutex shareHitsMtx;