From 096367c287e7bb04852a43d775e4da5b8e9614d9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 6 Nov 2023 12:47:42 +0300
Subject: fixes #3823 (Random crash)

---
 protocols/VKontakte/src/vk_options.cpp | 34 ++++++++++++++++++++++------------
 protocols/VKontakte/src/vk_struct.h    | 10 ----------
 2 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'protocols')

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index 3c80b825e8..1df4a97330 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -132,20 +132,30 @@ static CVKLang vkLangCodes[] = {
 	{ L"it", LPGENW("Italian") },
 };
 
-static CVKSync vkHistorySyncMethods[] =
+struct
 {
-	{ TranslateT("off"), SyncHistoryMetod::syncOff },
-	{ TranslateT("automatically"), SyncHistoryMetod::syncAuto },
-	{ TranslateT("for last 1 day"), SyncHistoryMetod::sync1Days },
-	{ TranslateT("for last 3 days"), SyncHistoryMetod::sync3Days }
+	const wchar_t *type;
+	SyncHistoryMetod data;
+}
+static vkHistorySyncMethods[] =
+{
+	{ LPGENW("off"), SyncHistoryMetod::syncOff },
+	{ LPGENW("automatically"), SyncHistoryMetod::syncAuto },
+	{ LPGENW("for last 1 day"), SyncHistoryMetod::sync1Days },
+	{ LPGENW("for last 3 days"), SyncHistoryMetod::sync3Days }
 };
 
-static CVKMarkMsgRead vkMarkMsgAsReadMethods[] =
+struct
+{
+	const wchar_t *type;
+	MarkMsgReadOn data;
+}
+static vkMarkMsgAsReadMethods[] =
 {
-	{ TranslateT("on read"), MarkMsgReadOn::markOnRead },
-	{ TranslateT("on receive"), MarkMsgReadOn::markOnReceive },
-	{ TranslateT("on reply"), MarkMsgReadOn::markOnReply },
-	{ TranslateT("on typing"), MarkMsgReadOn::markOnTyping }
+	{ LPGENW("on read"), MarkMsgReadOn::markOnRead },
+	{ LPGENW("on receive"), MarkMsgReadOn::markOnReceive },
+	{ LPGENW("on reply"), MarkMsgReadOn::markOnReply },
+	{ LPGENW("on typing"), MarkMsgReadOn::markOnTyping }
 };
 
 CVkOptionAccountForm::CVkOptionAccountForm(CVkProto *proto) :
@@ -183,7 +193,7 @@ bool CVkOptionAccountForm::OnInitDialog()
 
 	int iListIndex = MarkMsgReadOn::markOnRead;
 	for (int i = 0; i < _countof(vkMarkMsgAsReadMethods); i++) {
-		m_cbxMarkAsRead.InsertString((wchar_t *)vkMarkMsgAsReadMethods[i].type, i, vkMarkMsgAsReadMethods[i].data);
+		m_cbxMarkAsRead.InsertString(TranslateW(vkMarkMsgAsReadMethods[i].type), i, vkMarkMsgAsReadMethods[i].data);
 		if (vkMarkMsgAsReadMethods[i].data == m_proto->m_vkOptions.iMarkMessageReadOn)
 			iListIndex = i;
 	}
@@ -191,7 +201,7 @@ bool CVkOptionAccountForm::OnInitDialog()
 
 	iListIndex = SyncHistoryMetod::syncOff;
 	for (int i = 0; i < _countof(vkHistorySyncMethods); i++) {
-		m_cbxSyncHistory.InsertString((wchar_t *)vkHistorySyncMethods[i].type, i, vkHistorySyncMethods[i].data);
+		m_cbxSyncHistory.InsertString(TranslateW(vkHistorySyncMethods[i].type), i, vkHistorySyncMethods[i].data);
 		if (vkHistorySyncMethods[i].data == m_proto->m_vkOptions.iSyncHistoryMetod)
 			iListIndex = i;
 	}
diff --git a/protocols/VKontakte/src/vk_struct.h b/protocols/VKontakte/src/vk_struct.h
index 08ad3e9412..4537397358 100644
--- a/protocols/VKontakte/src/vk_struct.h
+++ b/protocols/VKontakte/src/vk_struct.h
@@ -222,16 +222,6 @@ enum SyncHistoryMetod : uint8_t { syncOff, syncAuto, sync1Days, sync3Days };
 enum MusicSendMetod : uint8_t { sendNone, sendStatusOnly, sendBroadcastOnly, sendBroadcastAndStatus };
 enum IMGBBCSypport : uint8_t { imgNo, imgFullSize, imgPreview130, imgPreview604 };
 
-struct CVKSync {
-	const wchar_t *type;
-	SyncHistoryMetod data;
-};
-
-struct CVKMarkMsgRead {
-	const wchar_t *type;
-	MarkMsgReadOn data;
-};
-
 struct CVkCookie
 {
 	CVkCookie(const CMStringA& name, const CMStringA& value, const CMStringA& domain) :
-- 
cgit v1.2.3