From 9631bfe941ed0cbba6e720b7efd92966e0c6a670 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 31 Jul 2014 17:50:56 +0000
Subject: old ugly trash removed from AVS

git-svn-id: http://svn.miranda-ng.org/main/trunk@10005 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/AVS/src/services.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'plugins/AVS/src/services.cpp')

diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp
index 24d4579e6b..cd1ac0fd72 100644
--- a/plugins/AVS/src/services.cpp
+++ b/plugins/AVS/src/services.cpp
@@ -37,8 +37,7 @@ INT_PTR GetAvatarBitmap(WPARAM hContact, LPARAM lParam)
 	CacheNode *node = FindAvatarInCache(hContact, TRUE);
 	if (node == NULL || !node->loaded)
 		return (INT_PTR)GetProtoDefaultAvatar(hContact);
-	else
-		return (INT_PTR)&node->ace;
+	return (INT_PTR)node;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -56,7 +55,7 @@ INT_PTR ProtectAvatar(WPARAM hContact, LPARAM lParam)
 		db_set_b(hContact, "ContactPhoto", "Locked", lParam ? 1 : 0);
 		if (lParam == 0)
 			MakePathRelative(hContact);
-		ChangeAvatar(hContact, TRUE);
+		ChangeAvatar(hContact, true);
 	}
 	return 0;
 }
@@ -179,9 +178,9 @@ static INT_PTR avSetAvatar(MCONTACT hContact, TCHAR *tszPath)
 	db_set_b(hContact, "ContactPhoto", "Locked", is_locked);
 	db_set_ts(hContact, "ContactPhoto", "File", szFinalName);
 	MakePathRelative(hContact, szFinalName);
-	// Fix cache
-	ChangeAvatar(hContact, TRUE);
 
+	// Fix cache
+	ChangeAvatar(hContact, true);
 	return 0;
 }
 
-- 
cgit v1.2.3