From 9a9fb7a9e71b45bc3b91a0c48373e12d385680b8 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 01 七月 2020 19:44:31 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Process/ProcessControl.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Process/ProcessControl.cs b/src/Bro.Process/ProcessControl.cs
index 04271dd..35c3af7 100644
--- a/src/Bro.Process/ProcessControl.cs
+++ b/src/Bro.Process/ProcessControl.cs
@@ -581,7 +581,7 @@
#region 鍥惧儚澶勭悊
protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
{
- ImageSet set = null;
+ IImageSet set = null;
if (IConfig.IsImageOffline)
{
@@ -628,7 +628,7 @@
TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "閲囧浘", (int)sw.ElapsedMilliseconds);
}
- imgSetId = set.Id;
+ imgSetId = set?.Id;
return set.HImage;
}
--
Gitblit v1.8.0