From 6e3c8f3870ecc32d6c0bce5a76aff2f9c33285e4 Mon Sep 17 00:00:00 2001 From: Fabien Bodard Date: Fri, 2 Nov 2012 14:23:02 +0000 Subject: [PATCH] [GB.DESKTOP] * BUG: Dont use the third argument on stock class * BUG: Swap the path test : first mimes and then mimetypes git-svn-id: svn://localhost/gambas/trunk@5287 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- gb.desktop/src/gb.desktop/.settings | 8 +++++++- gb.desktop/src/gb.desktop/.src/DesktopMime.class | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gb.desktop/src/gb.desktop/.settings b/gb.desktop/src/gb.desktop/.settings index 40d03b855..463b38bcc 100644 --- a/gb.desktop/src/gb.desktop/.settings +++ b/gb.desktop/src/gb.desktop/.settings @@ -1,8 +1,14 @@ [Breakpoints] Count=0 +[DebugWindow] +Count=0 + [OpenFile] Active=1 -File[1]=".src/DesktopMime.class:67.98" +File[1]=".src/DesktopMime.class:208.8" Count=1 +[Watches] +Count=0 + diff --git a/gb.desktop/src/gb.desktop/.src/DesktopMime.class b/gb.desktop/src/gb.desktop/.src/DesktopMime.class index 8fa5a0937..99bbbecac 100644 --- a/gb.desktop/src/gb.desktop/.src/DesktopMime.class +++ b/gb.desktop/src/gb.desktop/.src/DesktopMime.class @@ -65,8 +65,8 @@ Public Sub GetIcon(Optional Size As Integer = 16) As Image Endif 'If File.Ext(sFile) = "jpg" Then Stop If Not hImage Then - Try hImage = Stock[CStr(Size) &/ "mimetypes/" & sMime, CStr(Size) &/ "mimetypes/" & _$sGenericIcon].Image - If Not hImage Then Try hImage = Stock[CStr(Size) &/ "mimes/" & sMime, CStr(Size) &/ "mimes/" & _$sGenericIcon, True].Image + Try hImage = Stock[CStr(Size) &/ "mimes/" & sMime, CStr(Size) &/ "mimes/" & _$sGenericIcon].Image + If Not hImage Then Try hImage = Stock[CStr(Size) &/ "mimetypes/" & sMime, CStr(Size) &/ "mimetypes/" & _$sGenericIcon].Image Endif ' If Not hImage Then