plugins/libplugin-pay.c: Make sure blockheight disagreement does not …

…prevent all future progress.

plugins/libplugin-pay.c

@@ -2555,6 +2555,15 @@ static void waitblockheight_cb(void *d, struct payment *p)
 	 * this. The callback will set it to retry anyway. */
 	payment_set_step(p, PAYMENT_STEP_RETRY);
 
+	/* This will execute after handle_final_failure, which will
+	 * flag the entire payment for abortion.
+	 * Cancel that.
+	 * FIXME: The check for whether this is actually a blockheight
+	 * disagreement should be duplicated in handle_final_failure
+	 * and the root should not be aborted in the first place.
+	 */
+	payment_root(p)->abort = false;
+
 	req = jsonrpc_request_start(p->plugin, NULL, "waitblockheight",
 				    waitblockheight_rpc_cb,
 				    waitblockheight_rpc_cb, p);