mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-16 17:43:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix firmware updating/reinstallation

Browse Source
This commit is contained in:
Eladash 2021-02-08 18:57:37 +02:00 committed by Megamouse
parent dc2a1e270a
commit e38cd5149a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/Loader/TAR.cpp
View File

@ -116,16 +116,6 @@ bool tar_object::extract(std::string path, std::string ignore)
{ {
auto data = get_file(header.name).release(); auto data = get_file(header.name).release();
if (fs::file prev{result})
{
if (prev.to_vector<u8>() == static_cast<fs::container_stream<std::vector<u8>>*>(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); fs::file file(result, fs::rewrite);
if (file) if (file)

7
rpcs3/rpcs3qt/main_window.cpp
View File

@ -35,6 +35,7 @@
#include <QMimeData> #include <QMimeData>
#include <QMessageBox> #include <QMessageBox>
#include <QFileDialog> #include <QFileDialog>
#include <QFontDatabase>
#include "rpcs3_version.h" #include "rpcs3_version.h"
#include "Emu/System.h" #include "Emu/System.h"
@ -855,6 +856,9 @@ void main_window::HandlePupInstallation(QString file_path)
return; 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<int>(update_filenames.size()), false, this); progress_dialog pdlg(tr("RPCS3 Firmware Installer"), tr("Installing firmware version %1\nPlease wait...").arg(qstr(version_string)), tr("Cancel"), 0, static_cast<int>(update_filenames.size()), false, this);
pdlg.show(); 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) if (progress > 0)
{ {
gui_log.success("Successfully installed PS3 firmware version %s.", version_string); gui_log.success("Successfully installed PS3 firmware version %s.", version_string);