metacontacts fixes

1 files changed, 5 insertions, 2 deletions

diff --git a/utilities.cpp b/utilities.cpp
index 0648c37..67e0238 100755
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -234,7 +234,7 @@ int ToggleEncryption(WPARAM w, LPARAM l)
 		}
 	}
 	else
-		DBWriteContactSettingByte(metaGetMostOnline(hContact), szGPGModuleName, "GPGEncryption", enc?0:1);
+		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc?0:1);
 	void setSrmmIcon(HANDLE hContact);
 	void setClistIcon(HANDLE hContact);
 	setSrmmIcon(hContact);
@@ -393,7 +393,10 @@ int onProtoAck(WPARAM w, LPARAM l)
 							s = out.find(" ID ", s);
 							s += strlen(" ID ");
 							string::size_type s2 = out.find(",",s);
-							DBWriteContactSettingString(metaGetMostOnline(ccs->hContact), szGPGModuleName, "InKeyID", out.substr(s, s2-s).c_str());
+							if(metaIsProtoMetaContacts(ccs->hContact))
+								DBWriteContactSettingString(metaGetMostOnline(ccs->hContact), szGPGModuleName, "InKeyID", out.substr(s, s2-s).c_str());
+							else
+								DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "InKeyID", out.substr(s, s2-s).c_str());
 						}
 						void ShowLoadKeyPasswordWindow();
 						new_key_hcnt_mutex.lock();