diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-13 12:27:43 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-13 12:27:43 +0000 |
| commit | 90a99f237d2332a5d882c0dcd3e2b4572b04944f (patch) | |
| tree | 8bb85f56bc112a48873f42e9c9d0ede4be4dc34a /src/modules/metacontacts/meta_services.cpp | |
| parent | 5df94ff719eccd04c7450df35fb5e3f2b36e2ee7 (diff) | |
fixes #736 (Converting a contact into metacontact sometimes renames it)
git-svn-id: http://svn.miranda-ng.org/main/trunk@9786 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/metacontacts/meta_services.cpp')
| -rw-r--r-- | src/modules/metacontacts/meta_services.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp index 5c28a2bf66..1e83790031 100644 --- a/src/modules/metacontacts/meta_services.cpp +++ b/src/modules/metacontacts/meta_services.cpp @@ -380,12 +380,11 @@ int Meta_SettingChanged(WPARAM hContact, LPARAM lParam) mir_snprintf(buffer, SIZEOF(buffer), "Nick%d", contact_number);
db_set(ccMeta->contactID, META_PROTO, buffer, &dcws->value);
- DBVARIANT dbv;
- if (db_get_s(hContact, "CList", "MyHandle", &dbv, 0)) {
+ ptrT tszMyhandle(db_get_tsa(hContact, "CList", "MyHandle"));
+ if (tszMyhandle == NULL) {
mir_snprintf(buffer, SIZEOF(buffer), "CListName%d", contact_number);
db_set(ccMeta->contactID, META_PROTO, buffer, &dcws->value);
}
- else db_free(&dbv);
// copy nick to metacontact, if it's the most online
MCONTACT hMostOnline = Meta_GetMostOnline(ccMeta);
|