changeset 16669:e2fc81093e88

merge of '6493a0268b4841d23fcaa1c42f48ff37fcee402f' and '8e949b954897d4f1b9b28edd101c54f0f1e4659c'
author Richard Laager <rlaager@wiktel.com>
date Sun, 29 Apr 2007 19:47:08 +0000
parents 64ce75d3efd4 (diff) a4a20c1fdd95 (current diff)
children fc39fa0afdc8 516f14bef90e 171acd9ebb1a
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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