From 56ddd024ebfdcbb8b7d4e5790cb422e51570248d Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 27 Jul 2019 21:19:45 -0500 Subject: [PATCH] Fall back to Sans if no font setting found Sigh... --- src/text_file_functions.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 7247625..5a34ac8 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -226,14 +226,16 @@ pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QStrin } QString AOApplication::get_font_name(QString p_identifier, QString p_file) { - QString design_ini_path = get_theme_path(p_file); - QString f_result = read_design_ini(p_identifier, design_ini_path); - QString default_path = get_default_theme_path(p_file); - if(f_result == "") - { - f_result = read_design_ini(p_identifier, default_path); - } - return f_result; + QString design_ini_path = get_theme_path(p_file); + QString f_result = read_design_ini(p_identifier, design_ini_path); + QString default_path = get_default_theme_path(p_file); + if (f_result == "") + { + f_result = read_design_ini(p_identifier, default_path); + if (f_result == "") + return "Sans"; + } + return f_result; } int AOApplication::get_font_size(QString p_identifier, QString p_file) {