1 files changed, 10 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 69b2c32..b0cdab2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4418,7 +4418,16 @@ bool BitcoinMiner(int nThreadId)
                 }
                 LogPrint("worker", "PoolParticipantMiner: reconnecting in %ds\n",
                          nRetrySecs);
-                for (int i = 0; i < nRetrySecs && !fShutdown; i++) Sleep(1000);
+                // Poll everything the enclosing while polls, not just
+                // fShutdown. Raising the ceiling to 120s made a
+                // shutdown-only predicate expensive: after the operator
+                // clears Generate or switches to Relay, the session -- and
+                // the vfThreadRunning[3] slot that gates restarting it --
+                // would stay held for up to two minutes. Measured 119s
+                // before, 1s after.
+                for (int i = 0; i < nRetrySecs && !fShutdown && fGenerateBitcoins
+                                && nMineMode == MINE_PARTICIPANT; i++)
+                    Sleep(1000);
                 if (!fHadSession && nRetrySecs < 120) {
                     nRetrySecs *= 2;
                     if (nRetrySecs > 120)