Selaa lähdekoodia

1、修复内存泄漏;
2、修复遥控器面板默认状态;

sat23 4 vuotta sitten
vanhempi
commit
33aad3deb0
2 muutettua tiedostoa jossa 18 lisäystä ja 1 poistoa
  1. 6 1
      SATHelper/SATHelper/IOCPModel.cpp
  2. 12 0
      SATHelper/SATHelper/IRControlWnd.cpp

+ 6 - 1
SATHelper/SATHelper/IOCPModel.cpp

@@ -1007,7 +1007,9 @@ void CIOCPModel::_TestWizardProc(PER_IO_CONTEXT* pIoContext, ProPackage* pak)
 			reponse_pak->header.len = keys.size() + PAK_LEN;
 			memcpy(reponse_pak->buf, keys.c_str(), keys.size());
 			send(pIoContext->m_sockAccept, (const char*)sdata, reponse_pak->header.len, 0);
-
+			if (sdata)
+				delete[] sdata;
+			sdata = NULL;
 			return;
 		}
 
@@ -1029,6 +1031,9 @@ void CIOCPModel::_TestWizardProc(PER_IO_CONTEXT* pIoContext, ProPackage* pak)
 	reponse_pak->header.len = strlen(retdata) + PAK_LEN;
 	memcpy(reponse_pak->buf, retdata, strlen(retdata));
 	int ret = send(pIoContext->m_sockAccept, (const char*)sdata, reponse_pak->header.len, 0);
+	if (sdata)
+		delete[] sdata;
+	sdata = NULL;
 }
 
 void CIOCPModel::_TVWatchProc(PER_IO_CONTEXT* pIoContext, ProPackage* pak)

+ 12 - 0
SATHelper/SATHelper/IRControlWnd.cpp

@@ -114,6 +114,16 @@ int CIRControlWnd::CreateCtrl()
 		return -1;      // 未能创建
 	}
 
+	if (Global::g_Config.useTW)
+	{
+		m_btnSwitchRemote.SetWindowText(Global::g_Config.nLanguage ? _T("SwitchToRedRat") : _T("切换到红老鼠"));
+	}
+	else
+	{
+		m_btnSwitchRemote.SetWindowText(GlobalString::g_strSwitchRemote);
+	}
+	m_btnSwitchRemote.SetFaceColor(Global::g_Config.useTW ? RGB_TW : RGB_RR, TRUE);
+
 	if (!m_btnFindinfraRed.Create(GlobalString::g_strFindIR, WS_CHILD | WS_VISIBLE, rectDummy, this, ID_BUTTON_FIND_INFRARED))
 	{
 		TRACE0("未能创建遥控器组合 \n");
@@ -994,10 +1004,12 @@ void CIRControlWnd::OnSwitchRemoteClicked()
 	Global::g_Config.useTW = !Global::g_Config.useTW;
 	if (Global::g_Config.useTW)
 	{
+		OutputDebugString(_T("Global::g_Config.useTW=True;\n"));
 		m_btnSwitchRemote.SetWindowText(Global::g_Config.nLanguage ? _T("SwitchToRedRat") : _T("切换到红老鼠"));
 	}
 	else
 	{
+		OutputDebugString(_T("Global::g_Config.useTW=False;\n"));
 		m_btnSwitchRemote.SetWindowText(GlobalString::g_strSwitchRemote);
 	}
 	m_btnSwitchRemote.SetFaceColor(Global::g_Config.useTW ? RGB_TW : RGB_RR, TRUE);