diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
index 4592c5e..c7c118c 100644
--- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
+++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Util_PLC_TCPIP_SERVER.cpp
@@ -230,7 +230,10 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatestate()
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedButtonPlcTcpipServerUpdatedata()
 {
   m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
-  m_UpdateControls(FALSE);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
 }
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type)
@@ -243,8 +246,8 @@ void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type)
     g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCRunningState=static_cast<int>(g_pSo7_TCPIP_Server->DM5000[0]);
     for (int i=1;i<=8;i++)
     {
-      DM_Data[0]=(g_pSo7_TCPIP_Server->DM5000[i]>>8) && 0x0ff;
-      DM_Data[1]=(g_pSo7_TCPIP_Server->DM5000[i]) && 0x0ff;
+      DM_Data[0]=(g_pSo7_TCPIP_Server->DM5000[i]>>8) & 0x0ff;
+      DM_Data[1]=(g_pSo7_TCPIP_Server->DM5000[i]) & 0x0ff;
       g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2+1]=DM_Data[0];
       g_pSo7_TCPIP_Server->m_TCPIPServerState._PLCSensorState[(i-1)*2]=DM_Data[1];
     }
@@ -301,6 +304,11 @@ void CSo7_Util_PLC_TCPIP_SERVER::m_UpdateControls(int _type)
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrCcdDm()
 {
+  m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
   m_DMAddrList=DM_ADDR_CCD;
   m_UpdateListControl(E_LISTCTRL_TITLE);  
   m_UpdateListControl(E_LISTCTRL_DATA2CONTROL);
@@ -309,6 +317,11 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrCcdDm()
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm5000()
 {
+  m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
   m_DMAddrList=DM_ADDR_DM5000;  
   m_UpdateListControl(E_LISTCTRL_TITLE);  
   m_UpdateListControl(E_LISTCTRL_DATA2CONTROL);
@@ -317,6 +330,11 @@ void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm5000()
 //=====================================================================
 void CSo7_Util_PLC_TCPIP_SERVER::OnBnClickedRadioPlcTcpipServerAddrDm8000()
 {
+  m_UpdateListControl(E_LISTCTRL_CONTROL2DATA);
+  if (m_DMAddrList==DM_ADDR_DM5000)
+  {
+    m_UpdateControls(FALSE);
+  }
   m_DMAddrList=DM_ADDR_DM8000;  
   m_UpdateListControl(E_LISTCTRL_TITLE);  
   m_UpdateListControl(E_LISTCTRL_DATA2CONTROL);
diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo
index 6e45a5d..5ebc610 100644
Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ