Merge branch 'clh' into liuyang

mrDarker

6 天以前 829fe6c6bc33d53fda9c31fd45a37e1df87befff

 SourceCode/Bond/Servo/ServoDlg.cpp

@@ -195,7 +195,7 @@
               ASSERT(m_pPanelAttributes);
               m_pPanelEquipment->loadDataFromEquipment(pEquipment);
               m_pPanelAttributes->ShowWindow(SW_HIDE);
               if (!m_pPanelEquipment->IsWindowVisible()) {
               if (!m_pPanelEquipment->IsWindowVisible() && m_nLeftPanelType == 1) {
                  m_pPanelEquipment->ShowWindow(SW_SHOW);
                  Resize();
               }