Merge branch 'safe-shutdown' of dan/cwtch into master

2018-10-24 04:03:26 +00:00 · 2018-10-24 04:03:26 +00:00 · 22c8941282
parent 6fda5d223a d368ee1609
commit 22c8941282
1 changed files with 3 additions and 1 deletions
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@ -444,7 +444,9 @@ func (cp *cwtchPeer) Listen() error {
 // Shutdown kills all connections and cleans up all goroutines for the peer
 func (cp *cwtchPeer) Shutdown() {
 	cp.connectionsManager.Shutdown()
-	cp.app.Shutdown()
+	if cp.app != nil {
+		cp.app.Shutdown()
+	}
 	cp.Save()
 }