From eebfe35f7b33e1d2d307369ce440e8c3239a79ac Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 8 Nov 2023 18:28:42 +0300
Subject: =?UTF-8?q?fixes=20#3825=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=20?=
 =?UTF-8?q?=D0=B2=D1=81=D1=91=20=D0=B5=D1=89=D1=91=20=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=8E=D1=82=20=D0=B2=D0=B8=D0=B7=D1=83=D0=B0=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=B0=D1=80=D1=82=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D1=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/YAMN/res/YAMN.rc                | 4 ++--
 protocols/YAMN/src/proto/pop3/pop3opt.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols')

diff --git a/protocols/YAMN/res/YAMN.rc b/protocols/YAMN/res/YAMN.rc
index c8612a4719..3c4d83b74c 100644
--- a/protocols/YAMN/res/YAMN.rc
+++ b/protocols/YAMN/res/YAMN.rc
@@ -219,7 +219,7 @@ BEGIN
 END
 
 IDD_POP3ACCOUNTPOPUP DIALOGEX 0, 0, 315, 237
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE
+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
@@ -231,7 +231,7 @@ BEGIN
     CONTROL         "Use custom color",IDC_CHECKCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,83,107,10
     CONTROL         "",IDC_CPB,"ColourPicker",WS_TABSTOP,145,66,29,12
     CONTROL         "",IDC_CPT,"ColourPicker",WS_TABSTOP,145,82,29,12
-    EDITTEXT        IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDITPOPS,23,65,20,12,ES_AUTOHSCROLL                                          
     GROUPBOX        "No new mail notifications",IDC_GBNONEWMAIL,0,152,309,62
     CONTROL         "Popup if no mail",IDC_CHECKNPOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,94,10
     CONTROL         "Persistent message",IDC_CHECKNMSGP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,188,110,10
diff --git a/protocols/YAMN/src/proto/pop3/pop3opt.cpp b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
index bfec6d09e4..4ee9ff52a0 100644
--- a/protocols/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/protocols/YAMN/src/proto/pop3/pop3opt.cpp
@@ -831,7 +831,6 @@ public:
 	{
 		WindowList_Add(MessageWnds, m_hwnd);
 
-		DlgEnableAccountPopup(false);
 		DlgShowAccountPopup();
 		{
 			SReadGuard srb(POP3Plugin->AccountBrowserSO);
@@ -840,7 +839,7 @@ public:
 					if (ActualAccount->Name != nullptr)
 						cmbAccount.AddStringA(ActualAccount->Name);
 		}
-		ActualAccount = nullptr;
+
 		cmbAccount.SetCurSel(0);
 		onSelChange_Account(0);
 		return true;
@@ -944,6 +943,7 @@ public:
 			SendDlgItemMessageA(m_hwnd, IDC_COMBOACCOUNT, CB_GETLBTEXT, (WPARAM)Result, (LPARAM)DlgInput);
 		if ((Result == CB_ERR) || (nullptr == (ActualAccount = (CPOP3Account*)FindAccountByName(POP3Plugin, DlgInput)))) {
 			DlgSetItemText(m_hwnd, (WPARAM)IDC_STTIMELEFT, nullptr);
+			DlgEnableAccountPopup(false);
 		}
 		else {
 			DlgShowAccount(ActualAccount);
-- 
cgit v1.2.3