mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-07 03:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fix crash on startup in game_list_frame::Refresh

Browse Source 
QList isn't supposed to be modified concurrently.
Use lf_queue to collect game_info data.
This commit is contained in:
Nekotekina 2019-10-28 22:59:56 +03:00
parent 0b3939a58a
commit 83cf6e6fa3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpcs3/rpcs3qt/game_list_frame.cpp
View File

@ -10,6 +10,7 @@
#include "Emu/System.h"
#include "Loader/PSF.h"
#include "Utilities/types.h"
#include "Utilities/lockless.h"
#include <algorithm>
#include <iterator>
@ -455,6 +456,8 @@ void game_list_frame::Refresh(const bool fromDrive, const bool scrollAfter)
for (size_t i = 0; i < path_list.size(); ++i)
indices.append(i);
lf_queue<game_info> games;
QtConcurrent::blockingMap(indices, [&](size_t& i)
{
const std::string dir = path_list[i];
@ -537,7 +540,7 @@ void game_list_frame::Refresh(const bool fromDrive, const bool scrollAfter)
const QColor color = getGridCompatibilityColor(compat.color);
const QPixmap pxmap = PaintedPixmap(icon, hasCustomConfig, hasCustomPadConfig, color);
m_game_data.push_back(game_info(new gui_game_info{ game, compat, icon, pxmap, hasCustomConfig, hasCustomPadConfig }));
games.push(std::make_shared<gui_game_info>(gui_game_info{game, compat, icon, pxmap, hasCustomConfig, hasCustomPadConfig}));
}
catch (const std::exception& e)
{
@ -546,6 +549,11 @@ void game_list_frame::Refresh(const bool fromDrive, const bool scrollAfter)
}
});
for (auto&& g : games.pop_all())
{
m_game_data.push_back(std::move(g));
}
// Try to update the app version for disc games if there is a patch
for (const auto& entry : m_game_data)
{