X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcresources.C;h=ba67eeffd1da6d7d5ab37a6d34ed3f6038d9d453;hb=27fd3ea07d41d179c8fdcb5b8481960c1fcc37d5;hp=6e8e1ca7aaf70fa1f8ae419c8fbcf72316d0335c;hpb=4f7f413cbc1c6ea5da27cb75ca27a3ab317243ec;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bcresources.C b/cinelerra-5.1/guicast/bcresources.C
index 6e8e1ca7..ba67eeff 100644
--- a/cinelerra-5.1/guicast/bcresources.C
+++ b/cinelerra-5.1/guicast/bcresources.C
@@ -234,10 +234,11 @@ BC_Resources::BC_Resources()
 	wide_encoding = little_endian ?  "UTF32LE" : "UTF32BE";
 	use_xvideo = 1;
 
-#include "images/file_film_png.h"
 #include "images/file_folder_png.h"
-#include "images/file_sound_png.h"
 #include "images/file_unknown_png.h"
+#include "images/file_film_png.h"
+#include "images/file_sound_png.h"
+#include "images/file_label_png.h"
 #include "images/file_column_png.h"
 	static VFrame* default_type_to_icon[] =
 	{
@@ -245,6 +246,7 @@ BC_Resources::BC_Resources()
 		new VFramePng(file_unknown_png),
 		new VFramePng(file_film_png),
 		new VFramePng(file_sound_png),
+		new VFramePng(file_label_png),
 		new VFramePng(file_column_png)
 	};
 	type_to_icon = default_type_to_icon;
@@ -1440,7 +1442,7 @@ BC_FontEntry *BC_Resources::find_fontentry(const char *displayname, int style,
 			{
 				if(!style_match)
 					style_match = entry;
-				if(!preferred_match && (entry->style & preferred))
+				if(!preferred_match && entry->fixed_style == preferred)
 					preferred_match = entry;
 			}
 		}