dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-23 06:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ISO: Don't access m_game_info from icon_load_func

Browse Source
This commit is contained in:
Functionable 2025-12-13 12:51:38 +00:00
parent 641146294b
commit 8e3a045971
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rpcs3/rpcs3qt/savestate_manager_dialog.cpp
View File

@ -7,6 +7,8 @@
#include "gui_settings.h" #include "gui_settings.h"
#include "progress_dialog.h" #include "progress_dialog.h"
#include "Loader/ISO.h"
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QScrollBar> #include <QScrollBar>
@ -417,8 +419,9 @@ void savestate_manager_dialog::ResizeGameIcons()
const qreal dpr = devicePixelRatioF(); const qreal dpr = devicePixelRatioF();
const int savestate_index = item->data(GameUserRole::GameIndex).toInt(); const int savestate_index = item->data(GameUserRole::GameIndex).toInt();
const std::string icon_path = m_savestate_db[savestate_index]->game_icon_path; const std::string icon_path = m_savestate_db[savestate_index]->game_icon_path;
const std::string archive_path = m_savestate_db[savestate_index]->archive_path;
item->set_icon_load_func([this, icon_path, savestate_index, cancel = item->icon_loading_aborted(), dpr](int index) item->set_icon_load_func([this, icon_path, archive_path, savestate_index, cancel = item->icon_loading_aborted(), dpr](int index)
{ {
if (cancel && cancel->load()) if (cancel && cancel->load())
{ {
@ -445,15 +448,17 @@ void savestate_manager_dialog::ResizeGameIcons()
} }
} }
if (icon.isNull()) if (!archive_path.empty())
{ {
for (const game_info& gameinfo : m_game_info) iso_archive archive(archive_path);
auto icon_file = archive.open(icon_path);
auto icon_size = icon_file.size();
QByteArray data(icon_size, 0);
icon_file.read(data.data(), icon_size);
QImage iconImage;
if (iconImage.loadFromData(data))
{ {
if (gameinfo && gameinfo->info.serial == m_savestate_db[savestate_index]->title_id) icon = QPixmap::fromImage(iconImage);
{
icon = gameinfo->icon;
break;
}
} }
} }
@ -629,6 +634,11 @@ void savestate_manager_dialog::StartSavestateLoadThreads()
{ {
game_data_ptr->game_name = gameinfo->info.name; game_data_ptr->game_name = gameinfo->info.name;
game_data_ptr->game_icon_path = gameinfo->info.icon_path; game_data_ptr->game_icon_path = gameinfo->info.icon_path;
if (gameinfo->icon_in_archive)
{
game_data_ptr->archive_path = gameinfo->info.path;
}
break; break;
} }
} }

1
rpcs3/rpcs3qt/savestate_manager_dialog.h
View File

@ -48,6 +48,7 @@ private:
std::string game_name; std::string game_name;
std::string game_icon_path; std::string game_icon_path;
std::string dir_path; std::string dir_path;
std::string archive_path;
}; };
bool LoadSavestateFolderToDB(std::unique_ptr<game_savestates_data>&& game_savestates); bool LoadSavestateFolderToDB(std::unique_ptr<game_savestates_data>&& game_savestates);