From 13627600541c19643b96bd4c7b3a3d9fd92040f9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 29 Sep 2023 11:49:44 +0300
Subject: =?UTF-8?q?fixes=20#3694=20(tabSRMM:=20=D0=BF=D1=80=D0=B8=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D0=B1=D0=BE=D1=80=D0=B5=20=D1=81=D1=82=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BD=D0=B5=D0=B3=D0=BE=20=D0=B6=D1=83=D1=80=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=BF=D1=80=D0=BE=D0=BF=D0=B0=D0=B4=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82=20=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20"=D0=96?=
 =?UTF-8?q?=D1=83=D1=80=D0=BD=D0=B0=D0=BB")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/lpopts.cpp   |  5 ++---
 src/mir_app/src/srmm_log.cpp | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/lpopts.cpp b/src/mir_app/src/lpopts.cpp
index 7444c8e1dc..24818c95b2 100644
--- a/src/mir_app/src/lpopts.cpp
+++ b/src/mir_app/src/lpopts.cpp
@@ -232,9 +232,8 @@ bool CLangpackDlg::OnApply()
 		ReloadLangpack(tszPath);
 		
 		if (m_bExiting) {
-			HWND hwndParent = GetParent(GetHwnd());
-			PostMessage(hwndParent, WM_CLOSE, 1, 0);
-			mir_forkthread(ReloadOptions, hwndParent);
+			PostMessage(m_hwndParent, WM_CLOSE, 1, 0);
+			mir_forkthread(ReloadOptions, m_hwndParent);
 		}
 	}
 	return true;
diff --git a/src/mir_app/src/srmm_log.cpp b/src/mir_app/src/srmm_log.cpp
index bbbcc7fac0..b91204a59c 100644
--- a/src/mir_app/src/srmm_log.cpp
+++ b/src/mir_app/src/srmm_log.cpp
@@ -106,6 +106,19 @@ MIR_APP_DLL(bool) Srmm_IsCustomLogUsed()
 /////////////////////////////////////////////////////////////////////////////////////////
 // options dialog
 
+static void CALLBACK OpenOptions(void *)
+{
+	g_plugin.openOptions(L"Message sessions", L"Log viewer");
+}
+
+static void ReloadOptions(void *hWnd)
+{
+	while (IsWindow((HWND)hWnd))
+		Sleep(50);
+
+	CallFunctionAsync(OpenOptions, nullptr);
+}
+
 static class CSrmmLogOptionsDlg *pDialog = nullptr;
 
 class CSrmmLogOptionsDlg : public CDlgBase
@@ -145,6 +158,9 @@ public:
 
 		if (auto *pLogger = (LoggerClass *)m_list.GetItemData(idx))
 			g_logger = pLogger->szShortName;
+
+		PostMessage(m_hwndParent, WM_CLOSE, 1, 0);
+		mir_forkthread(ReloadOptions, m_hwndParent);
 		return true;
 	}
 
-- 
cgit v1.2.3