From c288fd47b80dcbd604b9b55e3ec175a216a200c5 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 9 Jan 2009 12:15:30 +0000
Subject: (GetFaceIcon) do not crash if some face images are missing (#45024)

---
 NEWS      | 1 +
 userdrake | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 NEWS

diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..c58f3b2
--- /dev/null
+++ b/NEWS
@@ -0,0 +1 @@
+- do not crash if some face images are missing (#45024)
diff --git a/userdrake b/userdrake
index c8a71c2..f311aa7 100755
--- a/userdrake
+++ b/userdrake
@@ -274,7 +274,10 @@ sub GetFaceIcon {
         my $f = $icon =~ m,^/, ? $icon : any::face2png($icon);
 	$us->{o}{iconval} = $icon;
 	gtkdestroy($us->{o}{icon});
-	$us->{o}{icon} = -e $f ? gtkcreate_img($f) : Gtk2::Label->new("No Icon");
+	# so that we do display "no icon" if either file doesn't exist or it's corrupted:
+	undef $us->{o}{icon};
+	$us->{o}{icon} = eval { gtkcreate_img($f) } if -e $f;
+	$us->{o}{icon} ||= Gtk2::Label->new("No Icon");
         $bt->add($us->{o}{icon});
 	$us->{o}{icon}->show;
     };
-- 
cgit v1.2.1