Z991239-2695 #comment fix: 进入比对后指纹实体直接返回Error_Cancel而无法采集指纹:上一次设置的Cancel标志未能恢复false导致

Module/mod_FingerPrint/FingerPrintFSM.cpp

@@ -959,6 +959,8 @@ void CFingerPrintFSM::ProcessAfterCollect(ScanParam* pScanParam, SpReqAnsContext
 	}
 	else if (pScanParam->m_TimeLeft >= FINGERPRINT_SCAN_TIMEOUT)
 	{
+		m_bCancelRegister = false;
+		m_bCancelMatch = false;
 		ctx->Ans.reserved1[0] = 2;
 		ctx->Answer(Error_Succeed);
 	}
@@ -1285,15 +1287,15 @@ ErrorCodeEnum CFingerPrintFSM::InitCommParam(ScanParam* initParam, int operateTy
 	if (!m_devInit)
 		errCode = Error_NotInit; //maybe no vendor adapter
 
-	if ((operateType & RegisterType) == RegisterType)
-	{
-		if (m_bCancelRegister) //no cancel button anymore while register
-		{
-			Dbg("cancel flag");
-			m_bCancelRegister = false;
-			errCode = Error_Cancel;
-		}
-	}
+	//if ((operateType & RegisterType) == RegisterType)
+	//{
+	//	if (m_bCancelRegister) //no cancel button anymore while register
+	//	{
+	//		Dbg("cancel flag");
+	//		m_bCancelRegister = false;
+	//		errCode = Error_Cancel;
+	//	}
+	//}
 	if ((operateType & MatchType) == MatchType && templateNum <= 0)
 		errCode = Error_Param;