From 5d7141972f7edc5f0818ea2040109f555e65fcdb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 9 Nov 2024 19:46:49 +0300
Subject: =?UTF-8?q?fixes=20#4768=20(TabSRMM:=20=D0=B3=D0=BB=D1=8E=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=20=D1=81=D0=BB=D0=B5=D0=B4=D0=B0=D0=BC=20?=
 =?UTF-8?q?=D0=B3=D0=B0=D0=BB=D0=BA=D0=B8=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=B3=D1=80=D1=83=D0=BF=D1=87=D0=B0=D1=82=D0=BE=D0=B2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/TabSRMM/src/chat_tools.cpp            | 2 +-
 plugins/TabSRMM/src/hotkeyhandler.cpp         | 2 +-
 protocols/SkypeWeb/src/skype_history_sync.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index 3f8f64d774..c5ef349ef8 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -350,7 +350,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 		if (Contact::IsReadonly(si->hContact) && iMuteMode != CHATMODE_UNMUTE)
 			return true;
 
-		AutoCreateWindow(nullptr, si->hContact);
+		PostMessage(PluginConfig.g_hwndHotkeyHandler, DM_CREATECONTAINER, si->hContact, 0);
 	}
 
 	return true;
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 06360ceaba..7e8bd67b38 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -221,7 +221,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		break;
 
 	case DM_CREATECONTAINER:
-		if (!AutoCreateWindow(0, wParam)) {
+		if (!AutoCreateWindow(0, wParam) && lParam) {
 			// no window created, simply add an unread event to contact list
 			DB::EventInfo dbei(lParam, false);
 			if (dbei && !(dbei.flags & DBEF_READ)) {
diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp
index dbcb6c780b..36e1763fdd 100644
--- a/protocols/SkypeWeb/src/skype_history_sync.cpp
+++ b/protocols/SkypeWeb/src/skype_history_sync.cpp
@@ -133,7 +133,7 @@ void CSkypeProto::OnSyncConversations(MHttpResponse *response, AsyncHttpRequest*
 			if (hContact != NULL) {
 				auto lastMsgTime = getLastTime(hContact);
 				if (lastMsgTime && lastMsgTime < id && m_bAutoHistorySync)
-					PushRequest(new GetHistoryRequest(hContact, szSkypename, 100, lastMsgTime, false));
+					PushRequest(new GetHistoryRequest(hContact, szSkypename, 100, lastMsgTime, true));
 			}
 		}
 	}
-- 
cgit v1.2.3