# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1177876028 0
# Node ID e2fc81093e88d4d7a8c5b7fd8ec4ab0de4d8016f
# Parent  64ce75d3efd43ab49917619b6073464f4e7fe8ba# Parent  a4a20c1fdd952510ebf840c31a82b84321a36b60
merge of '6493a0268b4841d23fcaa1c42f48ff37fcee402f'
     and '8e949b954897d4f1b9b28edd101c54f0f1e4659c'

diff -r a4a20c1fdd95 -r e2fc81093e88 libpurple/buddyicon.c
--- a/libpurple/buddyicon.c	Sun Apr 29 19:26:32 2007 +0000
+++ b/libpurple/buddyicon.c	Sun Apr 29 19:47:08 2007 +0000
@@ -854,7 +854,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