From e08fb98a32f32a585d9867ef0f31234ddc176d5e Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Sun, 14 Jun 2015 07:06:13 +0200 Subject: [PATCH] merge fix --- libethereum/Client.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libethereum/Client.cpp b/libethereum/Client.cpp index 63633225f..7d967f669 100644 --- a/libethereum/Client.cpp +++ b/libethereum/Client.cpp @@ -741,6 +741,10 @@ void Client::restartMining() onPostStateChanged(); } + + // Quick hack for now - the TQ at this point already has the prior pending transactions in it; + // we should resync with it manually until we are stricter about what constitutes "knowing". + onTransactionQueueReady(); } } @@ -750,10 +754,6 @@ void Client::onChainChanged(ImportRoute const& _ir) onDeadBlocks(_ir.deadBlocks, changeds); onNewBlocks(_ir.liveBlocks, changeds); restartMining(); - - // Quick hack for now - the TQ at this point already has the prior pending transactions in it; - // we should resync with it manually until we are stricter about what constitutes "knowing". - onTransactionQueueReady(); noteChanged(changeds); }