From 5eb599b7e3b9d0ae73661b74f5adbe05c73a50d2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Feb 2019 18:06:58 +0300 Subject: fixes #1846 (tabSRMM: get my own nick from "MyHandle") --- src/mir_app/src/contacts.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index f57493fee2..053b94490d 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -116,17 +116,10 @@ MIR_APP_DLL(wchar_t*) Contact_GetInfo(int type, MCONTACT hContact, const char *s case CNF_COSTATE: return ProcessDatabaseValueDefault(hContact, szProto, "CompanyState"); case CNF_COZIP: return ProcessDatabaseValueDefault(hContact, szProto, "CompanyZIP"); case CNF_COHOMEPAGE: return ProcessDatabaseValueDefault(hContact, szProto, "CompanyHomepage"); - - case CNF_CUSTOMNICK: - { - const char* saveProto = szProto; szProto = "CList"; - if (hContact != 0 && !ProcessDatabaseValueDefault(hContact, szProto, "MyHandle")) { - szProto = saveProto; - return nullptr; - } - szProto = saveProto; - } - break; + case CNF_CUSTOMNICK: + if (hContact) + return ProcessDatabaseValueDefault(hContact, "CList", "MyHandle"); + return ProcessDatabaseValueDefault(0, szProto, "MyHandle"); case CNF_COUNTRY: case CNF_COCOUNTRY: -- cgit v1.2.3