D2393.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D2393.diff
View Options

	diff --git a/src/init.cpp b/src/init.cpp
	--- a/src/init.cpp
	+++ b/src/init.cpp
	@@ -215,7 +215,9 @@

	// Because these depend on each-other, we make sure that neither can be
	// using the other before destroying them.
	- UnregisterValidationInterface(peerLogic.get());
	+ if (peerLogic) {
	+ UnregisterValidationInterface(peerLogic.get());
	+ }
	if (g_connman) {
	g_connman->Stop();
	}
	diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp
	--- a/src/validationinterface.cpp
	+++ b/src/validationinterface.cpp
	@@ -60,7 +60,9 @@
	}

	void CMainSignals::FlushBackgroundCallbacks() {
	- m_internals->m_schedulerClient.EmptyQueue();
	+ if (m_internals) {
	+ m_internals->m_schedulerClient.EmptyQueue();
	+ }
	}

	void CMainSignals::RegisterWithMempoolSignals(CTxMemPool &pool) {
	@@ -124,6 +126,9 @@
	}

	void UnregisterAllValidationInterfaces() {
	+ if (!g_signals.m_internals) {
	+ return;
	+ }
	g_signals.m_internals->BlockChecked.disconnect_all_slots();
	g_signals.m_internals->Broadcast.disconnect_all_slots();
	g_signals.m_internals->Inventory.disconnect_all_slots();