From 28e41061006a42d0866fbb68c65834e77f896fa4 Mon Sep 17 00:00:00 2001 From: Sergey Bolhovskoy Date: Sun, 28 Dec 2014 09:08:47 +0000 Subject: VKontakte: minor fix git-svn-id: http://svn.miranda-ng.org/main/trunk@11661 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/misc.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/VKontakte/src') diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index 511c5ce476..cb28afb644 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -884,14 +884,14 @@ CMString CVkProto::SetBBCString(TCHAR *tszString, VKBBCType bbcType, TCHAR *tszA } CMString res; - if (ptszFormat != NULL) { - if (bbcType == vkbbcUrl && m_iBBCForNews != bbcAdvanced) - res.AppendFormat(ptszFormat, tszString ? tszString : _T(""), tszAddString ? tszAddString : _T("")); - else if (m_iBBCForNews == bbcAdvanced && bbcType >= vkbbcUrl) - res.AppendFormat(ptszFormat, tszAddString ? tszAddString : _T(""), tszString ? tszString : _T("")); - else - res.AppendFormat(ptszFormat, tszString ? tszString : _T("")); - } + if (ptszFormat == NULL) + return CMString(tszString); + if (bbcType == vkbbcUrl && m_iBBCForNews != bbcAdvanced) + res.AppendFormat(ptszFormat, tszString ? tszString : _T(""), tszAddString ? tszAddString : _T("")); + else if (m_iBBCForNews == bbcAdvanced && bbcType >= vkbbcUrl) + res.AppendFormat(ptszFormat, tszAddString ? tszAddString : _T(""), tszString ? tszString : _T("")); + else + res.AppendFormat(ptszFormat, tszString ? tszString : _T("")); return res; } \ No newline at end of file -- cgit v1.2.3