[Monodevelop-patches-list] r2578 - in trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils: . FileIcons

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-06-02 10:05:17 -0400 (Thu, 02 Jun 2005)
New Revision: 2578

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
Log:
add back a try/catch


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog	2005-06-02 01:58:45 UTC (rev 2577)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/ChangeLog	2005-06-02 14:05:17 UTC (rev 2578)
@@ -1,5 +1,10 @@
 2005-06-01  John Luke  <john.luke at gmail.com>
 
+	* FileIcons/FileIconLoader.cs: add back one try/catch
+	from adrian at dreamsoftware.ro (Adrian Dinu), bug 75118
+
+2005-06-01  John Luke  <john.luke at gmail.com>
+
 	* FileIcons/FileIconLoader.cs (GetPixbufForFile):
 	just use size instead of height, width
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2005-06-02 01:58:45 UTC (rev 2577)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Gui.Utils/FileIcons/FileIconLoader.cs	2005-06-02 14:05:17 UTC (rev 2578)
@@ -51,8 +51,10 @@
 			// we have to cache them in both type and size
 			Gdk.Pixbuf bf = (Gdk.Pixbuf) iconHash [type+size];
 			if (bf == null) {
-				bf = IconTheme.Default.LoadIcon (type, size, (IconLookupFlags) 0);
-				if (bf == null) {
+				try {
+					bf = IconTheme.Default.LoadIcon (type, size, (IconLookupFlags) 0);
+				}
+				catch {
 					bf = DefaultIcon;
 					if (bf.Height > size)
 						bf = bf.ScaleSimple (size, size, Gdk.InterpType.Bilinear);