Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge changes from clemahieu/master

Browse source
This commit is contained in:
SergiySW 2017-07-21 23:52:51 +03:00
commit eb1a3c7a76
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rai/qt/qt.cpp
View file

@ -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 <rai::block> block_a)
this_l->wallet_m->send_async (this_l->account, account_l, actual, [this_w] (std::shared_ptr <rai::block> block_a)
{
if (auto this_l = this_w.lock ())
{