From 7bd2cd0a16f0af6e6d0d2606957fd7f20f253e2c Mon Sep 17 00:00:00 2001
From: Olaoluwa Osuntokun <laolu32@gmail.com>
Date: Fri, 1 Dec 2017 19:11:09 -0800
Subject: [PATCH] rpc: only cancel closeObserver if force close succeeds

---
 rpcserver.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rpcserver.go b/rpcserver.go
index 29ade4fe3..64f6168bb 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -824,7 +824,6 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
 		}
 		defer func() {
 			channel.Stop()
-			channel.CancelObserver()
 		}()
 
 		_, bestHeight, err := r.server.cc.chainIO.GetBestBlock()
@@ -872,6 +871,8 @@ func (r *rpcServer) CloseChannel(in *lnrpc.CloseChannelRequest,
 			},
 		}
 
+		channel.CancelObserver()
+
 		errChan = make(chan error, 1)
 		notifier := r.server.cc.chainNotifier
 		go waitForChanToClose(uint32(bestHeight), notifier, errChan, chanPoint,