From de3b19cbb2240399cb56b78f4759c8958c2b6dd7 Mon Sep 17 00:00:00 2001
From: haidy <haidycao@gmail.com>
Date: Wed, 16 May 2018 14:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0frpc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/control.go    | 4 +++-
 cmd/frpc/sub/root.go | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/control.go b/client/control.go
index 1a8b8453..8e10bfac 100644
--- a/client/control.go
+++ b/client/control.go
@@ -172,7 +172,9 @@ func (ctl *Control) Close() error {
 	ctl.mu.Lock()
 	defer ctl.mu.Unlock()
 	ctl.exit = true
-	ctl.conn.Close()
+	if ctl.conn != nil {
+		ctl.conn.Close()
+	}
 	ctl.pm.CloseProxies()
 	return nil
 }
diff --git a/cmd/frpc/sub/root.go b/cmd/frpc/sub/root.go
index 0c3e8dc5..7a8badcb 100644
--- a/cmd/frpc/sub/root.go
+++ b/cmd/frpc/sub/root.go
@@ -119,6 +119,7 @@ func StopFrp() (err error) {
 
 	service.Close()
 	log.Info("frpc is stoped")
+	os.Exit(0)
 	return
 }