From bc8768c453fade64f20ff18c24092a41f94993a0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 23 Jul 2020 14:15:06 +0300 Subject: =?UTF-8?q?fixes=20#2493=20(=D0=9F=D1=80=D0=BE=D0=B1=D0=BB=D0=B5?= =?UTF-8?q?=D0=BC=D0=B0=20=D1=81=20=D0=AE=D0=BD=D0=B8=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=BC=20=D0=B2=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B0=D0=BA=D1=82=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/Variables/src/parse_miranda.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/Variables/src') diff --git a/plugins/Variables/src/parse_miranda.cpp b/plugins/Variables/src/parse_miranda.cpp index 0e733a79ce..660cac158d 100644 --- a/plugins/Variables/src/parse_miranda.cpp +++ b/plugins/Variables/src/parse_miranda.cpp @@ -344,14 +344,14 @@ static wchar_t* parseProtoInfo(ARGUMENTSINFO *ai) return nullptr; const char *szRes = nullptr; - wchar_t *tszRes = nullptr; + wchar_t *wszRes = nullptr; ptrA szProto(mir_u2a(ai->argv.w[1])); if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PINAME))) - tszRes = Hlp_GetProtocolName(szProto); + wszRes = Hlp_GetProtocolName(szProto); else if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PIUIDTEXT))) { - szRes = (const char *)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAG_UNIQUEIDTEXT, 0); - if (INT_PTR(szRes) == CALLSERVICE_NOTFOUND || szRes == nullptr) + wszRes = (wchar_t *)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDTEXT, 0); + if (INT_PTR(wszRes) == CALLSERVICE_NOTFOUND || wszRes == nullptr) return nullptr; } else if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PIUIDSETTING))) { @@ -360,15 +360,15 @@ static wchar_t* parseProtoInfo(ARGUMENTSINFO *ai) return nullptr; } else if (!mir_wstrcmp(ai->argv.w[2], _A2W(STR_PINICK))) - tszRes = Contact_GetInfo(CNF_DISPLAY, NULL, szProto); + wszRes = Contact_GetInfo(CNF_DISPLAY, NULL, szProto); - if (szRes == nullptr && tszRes == nullptr) + if (szRes == nullptr && wszRes == nullptr) return nullptr; - if (szRes != nullptr && tszRes == nullptr) - tszRes = mir_a2u(szRes); + if (szRes != nullptr && wszRes == nullptr) + wszRes = mir_a2u(szRes); - return tszRes; + return wszRes; } static wchar_t* parseSpecialContact(ARGUMENTSINFO *ai) -- cgit v1.2.3