rpc: Interrupt block generation on shutdown request

promag · promag · commit 0851a75b5aad · 2018-02-16T13:00:32.000Z
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -116,7 +116,7 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen
     }
     unsigned int nExtraNonce = 0;
     UniValue blockHashes(UniValue::VARR);
-    while (nHeight < nHeightEnd)
+    while (nHeight < nHeightEnd && !ShutdownRequested())
     {
         std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(coinbaseScript->reserveScript));
         if (!pblocktemplate.get())

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ UniValue generateBlocks(std::shared_ptr<CReserveScript> coinbaseScript, int nGen`
`116`	`116`	`}`
`117`	`117`	`unsigned int nExtraNonce = 0;`
`118`	`118`	`UniValue blockHashes(UniValue::VARR);`
`119`		`- while (nHeight < nHeightEnd)`
	`119`	`+ while (nHeight < nHeightEnd && !ShutdownRequested())`
`120`	`120`	`{`
`121`	`121`	`std::unique_ptr<CBlockTemplate> pblocktemplate(BlockAssembler(Params()).CreateNewBlock(coinbaseScript->reserveScript));`
`122`	`122`	`if (!pblocktemplate.get())`