From 531124f8d4517fdd7e39efd64afe9c59c9bb604c Mon Sep 17 00:00:00 2001
From: ElzorFox <elzorfox@ya.ru>
Date: Tue, 9 Aug 2022 14:08:17 +0500
Subject: VKontakte: fix 'Unknow contact' for selfcontact version bump

---
 protocols/VKontakte/src/misc.cpp  | 6 +++---
 protocols/VKontakte/src/version.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols/VKontakte/src')

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 1a8e3999f1..a671733f58 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -1255,7 +1255,7 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport
 
 			CMStringW wszFromNick, wszFromUrl;
 			MCONTACT hFromContact = FindUser(iFromId);
-			if (hFromContact || iFromId == m_msgId)
+			if (hFromContact || iFromId == m_myUserId)
 				wszFromNick = ptrW(db_get_wsa(hFromContact, m_szModuleName, "Nick"));
 			else
 				wszFromNick = TranslateT("(Unknown contact)");
@@ -1469,7 +1469,7 @@ CMStringW CVkProto::GetAttachmentDescr(const JSONNode &jnAttachments, BBCSupport
 
 CMStringW CVkProto::GetFwdMessage(const JSONNode& jnMsg, const JSONNode& jnFUsers, OBJLIST<CVkUserInfo>& vkUsers, BBCSupport iBBC)
 {
-	UINT uid = jnMsg["from_id"].as_int();
+	LONG uid = jnMsg["from_id"].as_int();
 	CMStringW wszBody(jnMsg["text"].as_mstring());
 
 	CVkUserInfo* vkUser = vkUsers.find((CVkUserInfo*)&uid);
@@ -1481,7 +1481,7 @@ CMStringW CVkProto::GetFwdMessage(const JSONNode& jnMsg, const JSONNode& jnFUser
 	}
 	else {
 		MCONTACT hContact = FindUser(uid);
-		if (hContact || uid == m_msgId)
+		if (hContact || uid == m_myUserId)
 			wszNick = ptrW(db_get_wsa(hContact, m_szModuleName, "Nick"));
 		else
 			wszNick = TranslateT("(Unknown contact)");
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index 408a3302cb..b399bebac4 100644
--- a/protocols/VKontakte/src/version.h
+++ b/protocols/VKontakte/src/version.h
@@ -1,6 +1,6 @@
 #define __MAJOR_VERSION          0
 #define __MINOR_VERSION          1
-#define __RELEASE_NUM            13
+#define __RELEASE_NUM            14
 #define __BUILD_NUM              0
 
 #include <stdver.h>
-- 
cgit v1.2.3