f-spot r4556 - trunk/src/Core

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Sun Nov  2 19:27:03 2008
New Revision: 4556
URL: http://svn.gnome.org/viewvc/f-spot?rev=4556&view=rev

Log:
Fix for a bug uncovered by an innocent one-line patch

Modified:
   trunk/src/Core/Tag.cs

Modified: trunk/src/Core/Tag.cs
==============================================================================
--- trunk/src/Core/Tag.cs	(original)
+++ trunk/src/Core/Tag.cs	Sun Nov  2 19:27:03 2008
@@ -108,6 +108,9 @@
 					if (Math.Max (cached_icon.Width, cached_icon.Height) <= (int) tag_icon_size) 
 						return cached_icon;
 				}
+				if (icon == null)
+					return null;
+
 				if (Math.Max (icon.Width, icon.Height) >= (int) tag_icon_size) { //Don't upscale
 					if (cached_icon != null)
 						cached_icon.Dispose ();