From aa3f51fd00213fa82a2d7ad092e05319f6a4be90 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 9 Feb 2024 12:15:01 +0300
Subject: code cleaning

---
 plugins/UserInfoEx/src/psp_base.cpp     | 16 +++++++---------
 protocols/IRCG/src/options.cpp          |  9 ---------
 protocols/JabberG/src/jabber_opt.cpp    |  2 +-
 src/mir_app/src/options.cpp             |  2 +-
 src/mir_core/src/Windows/CCtrlCombo.cpp |  3 ++-
 5 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/plugins/UserInfoEx/src/psp_base.cpp b/plugins/UserInfoEx/src/psp_base.cpp
index 514e12a992..8b7824151c 100644
--- a/plugins/UserInfoEx/src/psp_base.cpp
+++ b/plugins/UserInfoEx/src/psp_base.cpp
@@ -109,13 +109,11 @@ const char *PSPBaseDlg::GetBaseProto() const
 
 void PSPBaseDlg::UpdateCountryIcon(CCtrlCombo &pCombo)
 {
-	LPIDSTRLIST pd = (LPIDSTRLIST)pCombo.GetCurData();
-	if (pd == nullptr)
-		return;
-
-	auto *pCtrl = FindControl(ICO_COUNTRY);
-	HICON hIcon = LoadFlagIcon(pd->nID);
-	HICON hOld = Static_SetIcon(pCtrl->GetHwnd(), hIcon);
-	pCtrl->Show(hIcon != 0);
-	IcoLib_ReleaseIcon(hOld);
+	if (LPIDSTRLIST pd = (LPIDSTRLIST)pCombo.GetCurData()) {
+		auto *pCtrl = FindControl(ICO_COUNTRY);
+		HICON hIcon = LoadFlagIcon(pd->nID);
+		HICON hOld = Static_SetIcon(pCtrl->GetHwnd(), hIcon);
+		pCtrl->Show(hIcon != 0);
+		IcoLib_ReleaseIcon(hOld);
+	}
 }
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 93194bcf6b..5583fcb699 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -742,9 +742,6 @@ public:
 	void OnPerformCombo(CCtrlData *)
 	{
 		PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetCurData();
-		if (pPerf == INVALID_HANDLE_VALUE)
-			return;
-
 		if (pPerf == nullptr)
 			m_pertormEdit.SetTextA("");
 		else
@@ -787,9 +784,6 @@ public:
 			MessageBox(nullptr, TranslateT("The usage of /AWAY in your perform buffer is restricted\n as IRC sends this command automatically."), TranslateT("IRC Error"), MB_OK);
 		else {
 			PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetCurData();
-			if (pPerf == INVALID_HANDLE_VALUE)
-				return;
-
 			if (pPerf != nullptr)
 				pPerf->mText = temp;
 
@@ -801,9 +795,6 @@ public:
 	void OnDelete(CCtrlButton *)
 	{
 		PERFORM_INFO *pPerf = (PERFORM_INFO *)m_performCombo.GetCurData();
-		if (pPerf == INVALID_HANDLE_VALUE)
-			return;
-
 		if (pPerf != nullptr) {
 			pPerf->mText = L"";
 			m_pertormEdit.SetTextA("");
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 016ec1efbf..b1cd46297f 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -482,7 +482,7 @@ protected:
 			m_proto->delSetting("Password");
 
 		char *szLanguageCode = (char *)m_cbLocale.GetCurData();
-		if (szLanguageCode && szLanguageCode != INVALID_HANDLE_VALUE) {
+		if (szLanguageCode) {
 			m_proto->setString("XmlLang", szLanguageCode);
 			replaceStr(m_proto->m_tszSelectedLang, szLanguageCode);
 		}
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index a0766677f1..2c0cada881 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -522,7 +522,7 @@ class COptionsDlg : public CDlgBase
 		}
 		else {
 			HINSTANCE hinst = (HINSTANCE)m_keywordFilter.GetCurData();
-			if (hinst != INVALID_HANDLE_VALUE) {
+			if (hinst) {
 				wchar_t szFileName[300];
 				GetModuleFileName(hinst, szFileName, _countof(szFileName));
 				wchar_t *pos = wcsrchr(szFileName, '\\');
diff --git a/src/mir_core/src/Windows/CCtrlCombo.cpp b/src/mir_core/src/Windows/CCtrlCombo.cpp
index a25614de49..c6d6294387 100644
--- a/src/mir_core/src/Windows/CCtrlCombo.cpp
+++ b/src/mir_core/src/Windows/CCtrlCombo.cpp
@@ -76,7 +76,8 @@ void CCtrlCombo::OnReset()
 
 LPARAM CCtrlCombo::GetCurData() const
 {
-	return GetItemData(GetCurSel());
+	int idx = GetCurSel();
+	return (idx == CB_ERR) ? 0 : GetItemData(idx);
 }
 
 // selects line with userdata passed
-- 
cgit v1.2.3