From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2
---
HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
index 1f0ce23..4015f81 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
@@ -108,7 +108,7 @@
}
buttonFram.SetONClickListener((fl, btn) =>
{
- if (buttonFram.Tag != null || buttonFram.Tag is SequencerEntity)
+ if (buttonFram.Tag != null && buttonFram.Tag is SequencerEntity)
{
var sequ = (SequencerEntity)buttonFram.Tag;
@@ -118,7 +118,7 @@
});
buttonFram.SetOFFClickListener((fl, btn) =>
{
- if (buttonFram.Tag != null || buttonFram.Tag is SequencerEntity)
+ if (buttonFram.Tag != null && buttonFram.Tag is SequencerEntity)
{
var sequ = (SequencerEntity)buttonFram.Tag;
SequencerControlExecute(sequ.seqId, "off");
@@ -151,7 +151,7 @@
btnName.MouseDownEventHandler += (sen, e) =>
{
btnName.IsSelected = true;
- if (btnName.Tag != null || btnName.Tag is SequencerEntity)
+ if (btnName.Tag != null && btnName.Tag is SequencerEntity)
{
var sequ = (SequencerEntity)btnName.Tag;
SequencerControlExecute(sequ.seqId, "on");
--
Gitblit v1.8.0