diff options
author | Thierry Vignaud <tv@mandriva.org> | 2009-01-09 12:15:30 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2009-01-09 12:15:30 +0000 |
commit | c288fd47b80dcbd604b9b55e3ec175a216a200c5 (patch) | |
tree | d516df8e26e6d9765eeaee06db1c16cbf0ef9eef | |
parent | d57d40de39046e9a9d235bed8cb7dd70720b67be (diff) | |
download | userdrake-c288fd47b80dcbd604b9b55e3ec175a216a200c5.tar userdrake-c288fd47b80dcbd604b9b55e3ec175a216a200c5.tar.gz userdrake-c288fd47b80dcbd604b9b55e3ec175a216a200c5.tar.bz2 userdrake-c288fd47b80dcbd604b9b55e3ec175a216a200c5.tar.xz userdrake-c288fd47b80dcbd604b9b55e3ec175a216a200c5.zip |
(GetFaceIcon) do not crash if some face images are missing (#45024)
-rw-r--r-- | NEWS | 1 | ||||
-rwxr-xr-x | userdrake | 5 |
2 files changed, 5 insertions, 1 deletions
@@ -0,0 +1 @@ +- do not crash if some face images are missing (#45024) @@ -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; }; |