From 26d4042436fe318085b8a98e8f7f1990e1f4c1e9 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Tue, 21 Feb 2017 16:18:25 +0100 Subject: [PATCH] bugfix: Assert was killing daemon This seems rather easy to fix, the only case we do not want to set `STATE_SHUTDOWN` us when we have updates which we have not committed yet, which is handled separately in the other IF-branch. --- daemon/peer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/daemon/peer.c b/daemon/peer.c index c448e8d52..573a5e25b 100644 --- a/daemon/peer.c +++ b/daemon/peer.c @@ -1856,10 +1856,9 @@ static bool peer_start_shutdown(struct peer *peer) queue_pkt_close_shutdown(peer); - if (peer->state == STATE_NORMAL_COMMITTING) + if (peer->state == STATE_NORMAL_COMMITTING) { newstate = STATE_SHUTDOWN_COMMITTING; - else { - assert(peer->state == STATE_NORMAL); + } else { newstate = STATE_SHUTDOWN; } set_peer_state(peer, newstate, __func__, true);