From 41a6c7f9b56fc1d48978f3dbf2c3a49d2a2fdfc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= <code@bnwr.net>
Date: Wed, 13 Jun 2018 14:14:24 +0800
Subject: [PATCH] Alpha/Baker: clean up timeouts in main loop

---
 src/proto_alpha/lib_delegate/client_baking_forge.ml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/proto_alpha/lib_delegate/client_baking_forge.ml b/src/proto_alpha/lib_delegate/client_baking_forge.ml
index e6c31d213..6fbec9db2 100644
--- a/src/proto_alpha/lib_delegate/client_baking_forge.ml
+++ b/src/proto_alpha/lib_delegate/client_baking_forge.ml
@@ -648,6 +648,8 @@ let create
         (* event matching *)
       | `Hash (None | Some (Error _)) ->
           (* return to restart *)
+          Lwt.cancel timeout ;
+          last_get_block := None ;
           Lwt.return_unit
 
       | `Hash (Some (Ok bi)) -> begin