Merge 881f21431d312885d54bd471e8849eabce6216b0 into 27db6217ecda9236f5bc25c65824f1e723810751

server/proxy/xtcp.go

@@ -19,6 +19,8 @@ import (
 	"reflect"
 	"sync"
 
+	"github.com/fatedier/golib/errors"
+
 	v1 "github.com/fatedier/frp/pkg/config/v1"
 	"github.com/fatedier/frp/pkg/msg"
 )
@@ -88,9 +90,11 @@ func (pxy *XTCPProxy) Run() (remoteAddr string, err error) {
 }
 
 func (pxy *XTCPProxy) Close() {
-	pxy.closeOnce.Do(func() {
 	pxy.BaseProxy.Close()
 	pxy.rc.NatHoleController.CloseClient(pxy.GetName())
+	pxy.closeOnce.Do(func() {
+		_ = errors.PanicToError(func() {
 			close(pxy.closeCh)
 		})
+	})
 }