From 2bcf1baac1eeac822c8f89210fe0300ab6371229 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 10 Oct 2023 14:21:06 +0300
Subject: =?UTF-8?q?fixes=20#3722=20(YAMN:=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=B2=D1=81=D0=BF=D0=BB=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=8E=D1=89=D0=B8=D1=85=20=D0=BE=D0=BA=D0=BE=D0=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/YAMN/src/proto/pop3/pop3opt.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'protocols/YAMN/src/proto/pop3')

diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index 2828fb232e..71b6b0642d 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -817,11 +817,9 @@ public:
 		chkCol.OnChange = chkFcol.OnChange = chkNcol.OnChange = Callback(this, &CPopupOptsDlg::onChange_Col);
 
 		cmbCP.OnSelChanged = Callback(this, &CPopupOptsDlg::onSelChange_CP);
+		cmbAccount.OnSelChanged = Callback(this, &CPopupOptsDlg::onSelChange_Account);
 
 		btnPreview.OnClick = Callback(this, &CPopupOptsDlg::onClick_Preview);
-
-		cmbAccount.OnKillFocus = Callback(this, &CPopupOptsDlg::onKillFocus_Account);
-		cmbAccount.OnSelChanged = Callback(this, &CPopupOptsDlg::onSelChange_Account);
 	}
 
 	bool OnInitDialog() override
@@ -839,6 +837,7 @@ public:
 		}
 		ActualAccount = nullptr;
 		cmbAccount.SetCurSel(0);
+		onSelChange_Account(0);
 		return true;
 	}
 
@@ -847,23 +846,6 @@ public:
 		WindowList_Remove(YAMNVar.MessageWnds, m_hwnd);
 	}
 
-	void onKillFocus_Account(CCtrlCombo *)
-	{
-		GetDlgItemTextA(m_hwnd, IDC_COMBOACCOUNT, DlgInput, _countof(DlgInput));
-		if (nullptr == (ActualAccount = (CPOP3Account*)FindAccountByName(POP3Plugin, DlgInput))) {
-			DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
-			if (mir_strlen(DlgInput))
-				DlgEnableAccountPopup(true);
-			else
-				DlgEnableAccountPopup(false);
-		}
-		else {
-			DlgShowAccount(ActualAccount);
-			DlgShowAccountColors();
-			DlgEnableAccountPopup(true);
-		}
-	}
-
 	void onSelChange_Account(CCtrlCombo *)
 	{
 		int Result = cmbAccount.GetCurSel();
-- 
cgit v1.2.3