X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcfilebox.C;h=212956b83a9050a76496559cfb22e9264f4fb064;hb=0a0a29dd9e484b5622b46173d51bb6cefc0a5da4;hp=207084d7415f054650989df444b4ba79905df8fe;hpb=4b6c39e6cf4a3fd9c1b347db6de686ab55d6cac8;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcfilebox.C b/cinelerra-5.1/guicast/bcfilebox.C
index 207084d7..212956b8 100644
--- a/cinelerra-5.1/guicast/bcfilebox.C
+++ b/cinelerra-5.1/guicast/bcfilebox.C
@@ -1,7 +1,7 @@
 
 /*
  * CINELERRA
- * Copyright (C) 1997-2011 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 1997-2017 Adam Williams <broadcast at earthling dot net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -883,25 +883,13 @@ int BC_FileBox::delete_tables()
 
 BC_Pixmap* BC_FileBox::get_icon(char *path, int is_dir)
 {
-	char *suffix = strrchr(path, '.');
+	if( is_dir ) return icons[ICON_FOLDER];
 	int icon_type = ICON_UNKNOWN;
-
-	if(is_dir) return icons[ICON_FOLDER];
-
-	if(suffix)
-	{
-		suffix++;
-		if(*suffix != 0)
-		{
-			for(int i = 0; i < TOTAL_SUFFIXES; i++)
-			{
-				if(!strcasecmp(suffix, BC_WindowBase::get_resources()->suffix_to_type[i].suffix))
-				{
-					icon_type = BC_WindowBase::get_resources()->suffix_to_type[i].icon_type;
-					break;
-				}
-			}
-		}
+	char *suffix = strrchr(path, '.');
+	if( suffix && *++suffix ) {
+		suffix_to_type_t *stp = &BC_WindowBase::get_resources()->suffix_to_type[0];
+		while( stp->suffix && strcasecmp(stp->suffix, suffix) ) ++stp;
+		if( stp->icon_type ) icon_type = stp->icon_type;
 	}
 
 	return icons[icon_type];