From 00bbfab6ef0a0e1da36f0ed2dc830f6f5aa200b0 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 19 Mar 2024 16:59:59 +0800
Subject: [PATCH] 1

---
 server/matchserver/team/matchmgr.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/matchserver/team/matchmgr.go b/server/matchserver/team/matchmgr.go
index 69f53d09..ff41d590 100644
--- a/server/matchserver/team/matchmgr.go
+++ b/server/matchserver/team/matchmgr.go
@@ -2,8 +2,8 @@ package team
 
 import (
 	"q5"
-	/*"f5"
-	"cs"
+	"f5"
+	/*"cs"
 	"main/common"
 	"mt"*/
 )
@@ -12,6 +12,7 @@ type matchingInfo struct {
 	team *team
 	addTick int64
 	entry q5.ListHead
+	matchTimerWp *f5.TimerWp
 	matchOk* matchingInfo
 }
 
@@ -48,6 +49,9 @@ func (this *matchMgr) cancelMatch(team *team) bool {
 			panic("cancelMatching error")
 			return false
 		}
+		if !m.matchTimerWp.Expired() {
+			f5.GetTimer().Delete(m.matchTimerWp)
+		}
 		m.entry.DelInit()
 		delete(this.teamUuidHash, team.GetTeamUuid())
 	}