changeset 16660:64ce75d3efd4

merge of '3e6c08926429636e5eadf17843abfe92b855e24b' and '5b88699a08a051f63111f06a71fb6735fac2a568'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sun, 29 Apr 2007 19:48:14 +0000
parents ce124db89c49 (current diff) df5fb079b1ad (diff)
children e2fc81093e88
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/buddyicon.c	Sun Apr 29 18:22:07 2007 +0000
+++ b/libpurple/buddyicon.c	Sun Apr 29 19:48:14 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