From 58e3971946c2f7e5f8d3663ae988d1949bedfedd Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 8 Nov 2023 12:19:46 +0300
Subject: =?UTF-8?q?fixes=20#3878=20(=D0=9C=D0=B5=D0=BD=D0=B5=D0=B4=D0=B6?=
 =?UTF-8?q?=D0=B5=D1=80=20=D1=83=D1=87=D1=91=D1=82=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B5=D0=B9=20=D0=BA=D0=BE=D1=80?=
 =?UTF-8?q?=D1=91=D0=B6=D0=B8=D1=82=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=83=D1=87=D1=91=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BA)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/proto_opts.cpp | 19 ++++++++++++-------
 src/mir_app/src/proto_ui.cpp   |  1 +
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/proto_opts.cpp b/src/mir_app/src/proto_opts.cpp
index 7b8bb41d36..1bb3365603 100644
--- a/src/mir_app/src/proto_opts.cpp
+++ b/src/mir_app/src/proto_opts.cpp
@@ -124,16 +124,16 @@ class CAccountListCtrl : public CCtrlListBox
 {
 	friend class CAccountManagerDlg;
 
-	int  m_iItem;
+	int  m_iItem = -1;
 	RECT m_rcCheck;
-	HWND m_hwndEdit;
+	HWND m_hwndEdit = nullptr;
 
 public:
 	CAccountListCtrl(CDlgBase *dlg, int ctrlId) :
-		CCtrlListBox(dlg, ctrlId),
-		m_iItem(-1),
-		m_hwndEdit(nullptr)
-	{}
+		CCtrlListBox(dlg, ctrlId)
+	{
+		memset(&m_rcCheck, 0, sizeof(m_rcCheck));
+	}
 
 	__forceinline CAccountManagerDlg* PARENT() { return (CAccountManagerDlg*)m_parentWnd; }
 
@@ -554,8 +554,13 @@ public:
 
 		Refresh();
 
-		m_accList.SetCurSel((idx >= m_accList.GetCount()) ? idx - 1 : idx);
+		if (idx >= m_accList.GetCount())
+			idx--;
+		m_accList.SetCurSel(idx);
+
+		m_iPrevSel = -1;
 		UpdateAccountInfo();
+		SelectItem(idx);
 
 		m_accList.Enable();
 		m_btnAdd.Enable();
diff --git a/src/mir_app/src/proto_ui.cpp b/src/mir_app/src/proto_ui.cpp
index 13319b83a1..be0cd6f9b3 100644
--- a/src/mir_app/src/proto_ui.cpp
+++ b/src/mir_app/src/proto_ui.cpp
@@ -109,6 +109,7 @@ INT_PTR CProtoIntDlgBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 
 	return CSuper::DlgProc(msg, wParam, lParam);
 }
+
 void CProtoIntDlgBase::UpdateStatusBar()
 {
 	SIZE sz;
-- 
cgit v1.2.3