From 6d4bf5371ed6a86346f0f24bf270a381d8ebd787 Mon Sep 17 00:00:00 2001 From: "parallelbgls@outlook.com" Date: Fri, 25 Dec 2015 16:43:27 +0800 Subject: [PATCH] 2015-12-25 update 4 continue fix bugs in fboxconnector --- Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs b/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs index 19b0828..ff27b0e 100644 --- a/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs +++ b/Modbus.Net/ModBus.Net/FBox/SignalRConnector.cs @@ -440,15 +440,15 @@ namespace ModBus.Net.FBox var groupUid = dataGroup.Uid; var groupName = dataGroup.Name; - if ((groupName != "(Default)" || groupName != "默认组") && !_connectionTokenState.ContainsKey(boxNo + "," + groupName)) + if (groupName != "(Default)" && groupName != "默认组" && !_connectionTokenState.ContainsKey(boxNo + "," + groupName)) { _connectionTokenState.Add(boxNo + "," + groupName, 1); } - if ((groupName != "(Default)" || groupName != "默认组") && !_groupNameUid.ContainsKey(boxNo + "," + groupName)) + if (groupName != "(Default)" && groupName != "默认组" && !_groupNameUid.ContainsKey(boxNo + "," + groupName)) { _groupNameUid.Add(boxNo + "," + groupName, groupUid); } - if ((groupName != "(Default)" || groupName != "默认组") && !_groupNameBoxUid.ContainsKey(boxNo + "," + groupName)) + if (groupName != "(Default)" && groupName != "默认组" && !_groupNameBoxUid.ContainsKey(boxNo + "," + groupName)) { _groupNameBoxUid.Add(boxNo + "," + groupName, boxUid); }