GUI: Always remove manually added fonts in OnChangeStyleSheetRequest()

This commit is contained in:
Eladash 2021-02-08 21:15:46 +02:00 committed by Megamouse
parent e38cd5149a
commit 78811b8816

View File

@ -464,6 +464,9 @@ void gui_application::OnChangeStyleSheetRequest()
return;
}
// Remove old fonts
QFontDatabase::removeAllApplicationFonts();
const QString stylesheet_name = m_gui_settings->GetValue(gui::m_currentStylesheet).toString();
if (stylesheet_name.isEmpty() || stylesheet_name == gui::DefaultStylesheet)
@ -506,9 +509,6 @@ void gui_application::OnChangeStyleSheetRequest()
{
const QString config_dir = qstr(fs::get_config_dir());
// Remove old fonts
QFontDatabase::removeAllApplicationFonts();
// Add PS3 fonts
QDirIterator ps3_font_it(qstr(g_cfg.vfs.get_dev_flash() + "data/font/"), QStringList() << "*.ttf", QDir::Files, QDirIterator::Subdirectories);
while (ps3_font_it.hasNext())