From eb1a3c7a76054b4897896cd7c6265e182ac6f091 Mon Sep 17 00:00:00 2001 From: SergiySW Date: Fri, 21 Jul 2017 23:52:51 +0300 Subject: [PATCH] Merge changes from clemahieu/master --- rai/qt/qt.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rai/qt/qt.cpp b/rai/qt/qt.cpp index 9baa0ac0..96f00ad3 100755 --- a/rai/qt/qt.cpp +++ b/rai/qt/qt.cpp @@ -629,7 +629,7 @@ void rai_qt::block_viewer::rebroadcast_action (rai::uint256_union const & hash_a auto block (wallet.node.store.block_get (transaction, hash_a)); if (block != nullptr) { - wallet.node.network.republish_block (*block); + wallet.node.network.republish_block (std::move (block)); auto successor (wallet.node.store.block_successor (transaction, hash_a)); if (!successor.is_zero ()) { @@ -939,7 +939,7 @@ void rai_qt::wallet::start () { if (auto this_l = this_w.lock ()) { - this_l->wallet_m->send_async (this_l->account, account_l, actual, [this_w] (std::unique_ptr block_a) + this_l->wallet_m->send_async (this_l->account, account_l, actual, [this_w] (std::shared_ptr block_a) { if (auto this_l = this_w.lock ()) {