[wallet] Add StopWallets() function to wallet/init.cpp

John Newbery · John Newbery · commit 77fe07c15913 · 2017-09-07T16:21:26.000-07:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -189,7 +189,7 @@ void Shutdown()
     StopRPC();
     StopHTTPServer();
 #ifdef ENABLE_WALLET
-    FlushWallets(false);
+    FlushWallets();
 #endif
     MapPort(false);
     UnregisterValidationInterface(peerLogic.get());
@@ -244,7 +244,7 @@ void Shutdown()
         pblocktree = nullptr;
     }
 #ifdef ENABLE_WALLET
-    FlushWallets(true);
+    StopWallets();
 #endif
 
 #if ENABLE_ZMQ
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp
@@ -246,8 +246,14 @@ bool OpenWallets()
     return true;
 }
 
-void FlushWallets(bool shutdown) {
+void FlushWallets() {
     for (CWalletRef pwallet : vpwallets) {
-        pwallet->Flush(shutdown);
+        pwallet->Flush(false);
+    }
+}
+
+void StopWallets() {
+    for (CWalletRef pwallet : vpwallets) {
+        pwallet->Flush(true);
     }
 }
diff --git a/src/wallet/init.h b/src/wallet/init.h
@@ -23,6 +23,8 @@ bool VerifyWallets();
 bool OpenWallets();
 
 //! Flush all wallets in preparation for shutdown.
-//! Call with shutdown = true to actually shutdown the wallet.
-void FlushWallets(bool shutdown);
+void FlushWallets();
+
+//! Stop all wallets. Wallets will be flushed first.
+void StopWallets();
 #endif // BITCOIN_WALLET_INIT_H

Original file line number	Diff line number	Diff line change
`@@ -246,8 +246,14 @@ bool OpenWallets()`
`246`	`246`	`return true;`
`247`	`247`	`}`
`248`	`248`
`249`		`-void FlushWallets(bool shutdown) {`
	`249`	`+void FlushWallets() {`
`250`	`250`	`for (CWalletRef pwallet : vpwallets) {`
`251`		`- pwallet->Flush(shutdown);`
	`251`	`+ pwallet->Flush(false);`
	`252`	`+ }`
	`253`	`+}`
	`254`	`+`
	`255`	`+void StopWallets() {`
	`256`	`+ for (CWalletRef pwallet : vpwallets) {`
	`257`	`+ pwallet->Flush(true);`
`252`	`258`	`}`
`253`	`259`	`}`