From cd7bd07a41a73ce520005d2317cb1a0ea5cdba52 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 30 Oct 2019 17:59:36 +0300
Subject: fixes #2109 (IEHistory doesn't display file transfers)

---
 plugins/IEHistory/src/dlgHandlers.cpp     | 4 +++-
 plugins/IEView/src/HistoryHTMLBuilder.cpp | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp
index 6c23d19653..fbd1ca7583 100644
--- a/plugins/IEHistory/src/dlgHandlers.cpp
+++ b/plugins/IEHistory/src/dlgHandlers.cpp
@@ -612,6 +612,8 @@ public:
 		chkLoadNumber(this, IDC_LOAD_NUMBER),
 		chkLastFirst(this, IDC_SHOW_LAST_FIRST)
 	{
+		chkLoadAll.OnChange = chkLoadNumber.OnChange = Callback(this, &COptionsDlg::onChange_All);
+
 		CreateLink(edtCount, g_plugin.iLoadCount);
 		CreateLink(chkRtl, g_plugin.bEnableRtl);
 		CreateLink(chkLoadBack, g_plugin.bUseWorker);
@@ -620,9 +622,9 @@ public:
 
 	bool OnInitDialog() override
 	{
-		onChange_All(0);
 		chkLoadAll.SetState(g_plugin.iLoadCount == 0);
 		chkLoadNumber.SetState(!chkLoadAll.GetState());
+		onChange_All(0);
 		return true;
 	}
 
diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp
index 80eeb13765..4bbb51d85a 100644
--- a/plugins/IEView/src/HistoryHTMLBuilder.cpp
+++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp
@@ -73,6 +73,7 @@ bool HistoryHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)
 {
 	switch (dbei->eventType) {
 	case EVENTTYPE_MESSAGE:
+	case EVENTTYPE_FILE:
 		return 1;
 	default:
 		return Utils::DbEventIsForHistory(dbei);
@@ -81,11 +82,11 @@ bool HistoryHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)
 
 char *HistoryHTMLBuilder::timestampToString(time_t check)
 {
-	static char szResult[512];
 	char str[80];
 	TimeZone_ToString(check, "d t", str, _countof(str));
-	mir_strncat(szResult, str, _countof(szResult) - mir_strlen(szResult));
-	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);
+
+	static char szResult[512];
+	mir_strncpy(szResult, ptrA(mir_utf8encode(str)), 500);
 	return szResult;
 }
 
-- 
cgit v1.2.3