diff options
author | George Hazan <ghazan@miranda.im> | 2019-02-27 18:38:26 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2019-02-27 18:38:26 +0300 |
commit | e8a8773ceb8e570207cef9659c30f79d32fb93ae (patch) | |
tree | 1828852b3b219cc6eb0a8667e1e091d1136df8f4 /src | |
parent | d9e4116257cb8ca45ea5cf8b2db0a865779dbe06 (diff) |
h++ => #1846
Diffstat (limited to 'src')
-rw-r--r-- | src/mir_app/src/contacts.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 053b94490d..dc7af82b37 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -186,8 +186,9 @@ MIR_APP_DLL(wchar_t*) Contact_GetInfo(int type, MCONTACT hContact, const char *s case 0: // custom name
// make sure we aren't in CNF_DISPLAYNC mode
// don't get custom name for nullptr contact
- if (hContact != 0 && type == CNF_DISPLAY && (res = ProcessDatabaseValueDefault(hContact, "CList", "MyHandle")) != nullptr)
- return res;
+ if (type == CNF_DISPLAY)
+ if (res = ProcessDatabaseValueDefault(hContact, (hContact != 0) ? "CList" : szProto, "MyHandle"))
+ return res;
break;
case 1:
|