From 1d1a359538f1aa96e0bd088159f85ee33a1fee0a Mon Sep 17 00:00:00 2001
From: CJ980606 <805250096@qq.com>
Date: Thu, 8 Jun 2023 17:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=86=E5=88=AB=E6=B5=B7?=
 =?UTF-8?q?=E5=BA=B7=E5=9B=BA=E4=BB=B6BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cigarette/cigarette.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cigarette/cigarette.cpp b/Cigarette/cigarette.cpp
index cce6c7d..ce9adc3 100644
--- a/Cigarette/cigarette.cpp
+++ b/Cigarette/cigarette.cpp
@@ -3116,6 +3116,7 @@ void Cigarette::EnumerateCameras(SingleCamInfoStruct *TempSingleCamInfoStruct,bo
 			void* camhandle;
 			MVCC_STRINGVALUE UserID;
 			MVCC_STRINGVALUE YSXID;
+			MVCC_STRINGVALUE YSXID2;
 			string id;
 			MV_CC_CreateHandle(&camhandle, HIKCamera::stDeviceList.pDeviceInfo[i]);
 			if (!MV_CC_OpenDevice(camhandle))
@@ -3123,7 +3124,6 @@ void Cigarette::EnumerateCameras(SingleCamInfoStruct *TempSingleCamInfoStruct,bo
 				MV_CC_GetDeviceUserID(camhandle, &UserID);
 				MV_CC_GetStringValue(camhandle, "DeviceYSXID", &YSXID);
 				if(showinfo)std::cout << "Hikrobot user ID = " << UserID.chCurValue << std::endl;
-				cout << "Hikrobot YSX ID = " << YSXID.chCurValue << std::endl;
 				id = YSXID.chCurValue;
 #ifdef identify_Hik_YSXID
 				if (id!="YSX9256")
@@ -3131,6 +3131,7 @@ void Cigarette::EnumerateCameras(SingleCamInfoStruct *TempSingleCamInfoStruct,bo
 					QMessageBox::information(NULL, QStringLiteral("系统自检失败"), QStringLiteral("相机匹配失败，请检查相机型号"), QMessageBox::Ok);
 					exit(-1);
 				}
+				YSXID = YSXID2;//清除数据
 #endif
 				MV_CC_CloseDevice(camhandle);
 			}