From c0382d76498532251fc13ce5b7bfa470fcfddd84 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 26 七月 2023 09:18:42 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Entity/Function/Scene.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 1e6d11d..fdf195b 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -560,6 +560,10 @@
private Function ConvertFunctionObject()
{
var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
+ if(localFunction == null)
+ {
+ localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
+ }
return localFunction;
}
--
Gitblit v1.8.0