From e38cd5149a8ab68fa03ffea40dc797759c871a34 Mon Sep 17 00:00:00 2001 From: Eladash Date: Mon, 8 Feb 2021 18:57:37 +0200 Subject: [PATCH] Fix firmware updating/reinstallation --- rpcs3/Loader/TAR.cpp | 10 ---------- rpcs3/rpcs3qt/main_window.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/rpcs3/Loader/TAR.cpp b/rpcs3/Loader/TAR.cpp index d0bfdfe28b..823029bbd4 100644 --- a/rpcs3/Loader/TAR.cpp +++ b/rpcs3/Loader/TAR.cpp @@ -116,16 +116,6 @@ bool tar_object::extract(std::string path, std::string ignore) { auto data = get_file(header.name).release(); - if (fs::file prev{result}) - { - if (prev.to_vector() == static_cast>*>(data.get())->obj) - { - // Workaround: avoid overwriting existing data if it's the same. - tar_log.notice("TAR Loader: skipped existing file %s", header.name); - break; - } - } - fs::file file(result, fs::rewrite); if (file) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 04dd1196a4..806e7b222f 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "rpcs3_version.h" #include "Emu/System.h" @@ -855,6 +856,9 @@ void main_window::HandlePupInstallation(QString file_path) return; } + // Remove possibly PS3 fonts from database + QFontDatabase::removeAllApplicationFonts(); + progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast(update_filenames.size()), false, this); pdlg.show(); @@ -919,6 +923,9 @@ void main_window::HandlePupInstallation(QString file_path) } } + // Update with newly installed PS3 fonts + Q_EMIT RequestGlobalStylesheetChange(); + if (progress > 0) { gui_log.success("Successfully installed PS3 firmware version %s.", version_string);