1 files changed, 8 insertions, 5 deletions
diff --git a/srmm.cpp b/srmm.cpp
index af21f8f..6fc204a 100644..100755
--- a/srmm.cpp
+++ b/srmm.cpp
@@ -1,4 +1,4 @@
-// Copyright © 2010 SecureIM developers (baloo and others), sss
+// Copyright © 2010-2012 SecureIM developers (baloo and others), sss
 // 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -34,9 +34,12 @@ int __cdecl onWindowEvent(WPARAM wParam, LPARAM lParam) {
 
 int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 	HANDLE hContact = (HANDLE)wParam;
-	HANDLE hMeta = hContact;
+	HANDLE hMeta = NULL;
 	if(metaIsProtoMetaContacts(hContact))
+	{
+		hMeta = hContact;
 		hContact = metaGetMostOnline(hContact); // возьмем тот, через который пойдет сообщение
+	}
 	else if(metaIsSubcontact(hContact))
 		hMeta = metaGetContact(hContact);
 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;
@@ -50,7 +53,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 	if(enc)
 	{
 		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-		DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 0);
+		hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 0):0;
 		setSrmmIcon(hContact);
 		setClistIcon(hContact);
 	}
@@ -68,7 +71,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 		else
 		{
 			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-			DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1);
+			hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1):0;
 			setSrmmIcon(hContact);
 			setClistIcon(hContact);
 			return 0;
@@ -76,7 +79,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
 		if(isContactHaveKey(hContact))
 		{
 			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-			DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1);
+			hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1):0;
 			setSrmmIcon(hContact);
 			setClistIcon(hContact);
 		}