# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177809048 0
# Node ID 7135dd81991cadcc10970dfa8e93c1f4086eaf83
# Parent  4eb08fcc16d8793004258e0f79974a92ccc2a930# Parent  ee8bb9b5acb8b25fafb161ea3cf817c94d73d29f
merge of '8bc9a8784cf40932a34e08e80f0d6585812b985a'
     and 'a35e9c6965a0723281ab3a62044581a55d2e59a2'

diff -r ee8bb9b5acb8 -r 7135dd81991c libpurple/buddyicon.c
--- a/libpurple/buddyicon.c	Sun Apr 29 00:15:08 2007 +0000
+++ b/libpurple/buddyicon.c	Sun Apr 29 01:10:48 2007 +0000
@@ -721,7 +721,7 @@
 
 	if (old_img)
 		purple_imgstore_unref(old_img);
-	else
+	else if (old_icon)
 	{
 		/* The old icon may not have been loaded into memory.  In that
 		 * case, we'll need to uncache the filename.  The filenames