summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-11-30 18:25:48 +0200
committerGluzskiy Alexandr <sss123next@list.ru>2010-11-30 18:25:48 +0200
commit1f5acb24f8483d5d6b0e55299579ad5ee975c9b1 (patch)
treec184138aadf482376ae7cd064924f7533b930677 /main.cpp
parent6cf18be1f2a73e501cf855de4db7dd57a52581d5 (diff)
fixed crash on metacontacts key import
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index 7a189e2..ebe5ed8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1726,7 +1726,6 @@ void ImportKey()
if(metaIsProtoMetaContacts(hContact))
if(MessageBox(0, _T("Do you want load key for all subcontacts ?"), _T("Metacontact detected"), MB_YESNO) == IDYES)
for_all_sub = true;
-
if(metaIsProtoMetaContacts(hContact))
{
HANDLE hcnt = NULL;
@@ -1760,7 +1759,10 @@ void ImportKey()
_tcscat(tmp2, _T("temporary_exported.asc"));
DeleteFile(tmp2);
wfstream f(tmp2, std::ios::out);
- ptmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
+ if(metaIsProtoMetaContacts(hContact))
+ ptmp = UniGetContactSettingUtf(metaGetCurrent(hContact), szGPGModuleName, "GPGPubKey", _T(""));
+ else
+ ptmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
wstring new_key = ptmp;
mir_free(ptmp);
f<<new_key.c_str();