aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-03-13 17:22:10 +0100
committerRiccardo Spagni <ric@spagni.net>2017-03-13 17:22:10 +0100
commit22e51c5d29a893e7e16c7c17b9a52512acf6a77e (patch)
tree13251ecc8283529c13f085df2ebf93a60569fa8f /src
parentMerge pull request #1857 (diff)
parentprotocol: fix fluffy to normal block dropping txes (diff)
downloadmonero-22e51c5d29a893e7e16c7c17b9a52512acf6a77e.tar.xz
Merge pull request #1863
09e060fe protocol: fix fluffy to normal block dropping txes (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler.inl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index f007a83a8..bb242c5f1 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -605,7 +605,7 @@ namespace cryptonote
NOTIFY_NEW_BLOCK::request reg_arg = AUTO_VAL_INIT(reg_arg);
reg_arg.hop = arg.hop;
reg_arg.current_blockchain_height = arg.current_blockchain_height;
- reg_arg.b.block = b.block;
+ reg_arg.b = b;
relay_block(reg_arg, context);
}
else if( bvc.m_marked_as_orphaned )