From deb05176bf259030db8d5f8ff7c68b5feb325770 Mon Sep 17 00:00:00 2001
From: Sergey Bolhovskoy <elzorfox@ya.ru>
Date: Fri, 26 Jun 2015 07:37:59 +0000
Subject: VKontakte: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14391 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/VKontakte/src/vk_feed.cpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'protocols/VKontakte/src/vk_feed.cpp')

diff --git a/protocols/VKontakte/src/vk_feed.cpp b/protocols/VKontakte/src/vk_feed.cpp
index b403a15c2e..717f155d79 100644
--- a/protocols/VKontakte/src/vk_feed.cpp
+++ b/protocols/VKontakte/src/vk_feed.cpp
@@ -202,7 +202,7 @@ CVKNewsItem* CVkProto::GetVkNewsItem(const JSONNode &jnItem, OBJLIST<CVkUserInfo
 		}
 
 		const JSONNode &jnAttachments = jnItem["attachments"];
-		if (!jnAttachments.isnull()){
+		if (!jnAttachments.isnull()) {
 			if (!tszText.IsEmpty())
 				tszText.AppendChar(_T('\n'));
 			tszText += GetAttachmentDescr(jnAttachments, m_bUseBBCOnAttacmentsAsNews ? m_iBBCForNews : m_iBBCForAttachments);
@@ -408,17 +408,15 @@ CVKNewsItem* CVkProto::GetVkNotificationsItem(const JSONNode &jnItem, OBJLIST<CV
 	CMString tszNotificationTranslate = SpanVKNotificationType(tszType, vkFeedbackType, vkParentType);
 		
 	const JSONNode &jnFeedback = jnItem["feedback"];
-	if (!jnFeedback)
+	const JSONNode &jnParent = jnItem["parent"];
+	
+	if (!jnFeedback || !jnParent)
 		return NULL;
 
 	CVkUserInfo *vkUser = NULL;
 	CMString tszFeedback = GetVkFeedback(jnFeedback, vkFeedbackType, vkUsers, vkUser);
-
-	const JSONNode &jnParent = jnItem["parent"];
-	if (!jnParent)
-		return NULL;
-
 	CVKNewsItem* vkNotification = GetVkParent(jnParent, vkParentType);
+
 	if (!vkNotification)
 		return NULL;
 	
@@ -616,7 +614,7 @@ bool CVkProto::FilterNotification(CVKNewsItem* vkNotificationItem, bool& isComme
 
 	if (vkNotificationItem->tszType == _T("mention_comments")
 		|| vkNotificationItem->tszType == _T("mention_comment_photo")
-		|| vkNotificationItem->tszType == _T("mention_comment_video")){
+		|| vkNotificationItem->tszType == _T("mention_comment_video")) {
 		isCommented = true;
 		return m_bNotificationFilterMentions;
 	}
-- 
cgit v1.2.3