From 13211f457c437c4475fa1bb2a46bf30f07818f76 Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:56:07 +0200
Subject: [PATCH] Always reset nonce on RandomX dataset change

Also never get a new job when mining is paused
---
 src/backend/cpu/CpuWorker.cpp | 4 +++-
 src/core/Miner.cpp            | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/backend/cpu/CpuWorker.cpp b/src/backend/cpu/CpuWorker.cpp
index b6aad699..63796b70 100644
--- a/src/backend/cpu/CpuWorker.cpp
+++ b/src/backend/cpu/CpuWorker.cpp
@@ -389,7 +389,9 @@ void xmrig::CpuWorker<N>::start()
             }
         }
 
-        consumeJob();
+        if (!Nonce::isPaused()) {
+            consumeJob();
+        }
     }
 }
 
diff --git a/src/core/Miner.cpp b/src/core/Miner.cpp
index fd243f0d..67c33a33 100644
--- a/src/core/Miner.cpp
+++ b/src/core/Miner.cpp
@@ -576,6 +576,11 @@ void xmrig::Miner::setJob(const Job &job, bool donate)
 
 #   ifdef XMRIG_ALGO_RANDOMX
     const bool ready = d_ptr->initRX();
+
+    // Always reset nonce on RandomX dataset change
+    if (!ready) {
+        d_ptr->reset = true;
+    }
 #   else
     constexpr const bool ready = true;
 #   endif