View | Details | Raw Unified | Return to bug 715967
Collapse All | Expand All

(-)src/splashy_video.c (-7 / +9 lines)
Lines 880-898 Link Here
880
880
881
        video.fontdesc.flags = DFDESC_HEIGHT;
881
        video.fontdesc.flags = DFDESC_HEIGHT;
882
882
883
        fontface = g_build_filename (splashy_get_config_string (SPL_THEMES_DIR), splashy_get_config_string ("/splashy/textbox/text/font/file"), NULL);
883
        fontface = g_build_filename (splashy_get_config_string (SPL_THEMES_DIR), 
884
				     splashy_get_config_string (SPL_CURRENT_THEME), 
885
				     splashy_get_config_string ("/splashy/textbox/text/font/file"), NULL);
886
	if (access (fontface, R_OK) < 0)
887
	{
888
		ERROR_PRINT("Couldn't access font file '%s'\n", fontface);
889
		return -1;
890
	}
891
   
884
        temp = splashy_get_config_int ("/splashy/textbox/text/font/height",
892
        temp = splashy_get_config_int ("/splashy/textbox/text/font/height",
885
                                       10);
893
                                       10);
886
894
887
        video.fontdesc.height = temp * screen_height / divider_height;
895
        video.fontdesc.height = temp * screen_height / divider_height;
888
        video.dfb->CreateFont (video.dfb, fontface,
896
        video.dfb->CreateFont (video.dfb, fontface,
889
                               &video.fontdesc, &video.font);
897
                               &video.fontdesc, &video.font);
890
        /* we are in trouble, let's try to use any default font by
891
         * libdirectfb 
892
         */
893
        if (video.font == NULL)
894
                video.dfb->CreateFont (video.dfb, NULL, NULL, &video.font);
895
896
        /* ouch */
898
        /* ouch */
897
        if (video.font == NULL)
899
        if (video.font == NULL)
898
                return -1;
900
                return -1;

Return to bug 715967