From 78811b88161a61c239c19b6c1009edf13fbf54ed Mon Sep 17 00:00:00 2001 From: Eladash Date: Mon, 8 Feb 2021 21:15:46 +0200 Subject: [PATCH] GUI: Always remove manually added fonts in OnChangeStyleSheetRequest() --- rpcs3/rpcs3qt/gui_application.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 7ea106705d..48b2f9fd21 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -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())