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

---
 src/mir_app/src/options.cpp             | 2 +-
 src/mir_core/src/Windows/CCtrlCombo.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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