archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 18:58:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move blocking code in order to free the explorer

Browse source
This commit is contained in:
Megamouse 2020-11-25 18:40:33 +01:00
parent 1500e5f588
commit cde802b16c
2 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

33
rpcs3/rpcs3qt/main_window.cpp
View file

@ -574,12 +574,19 @@ void main_window::InstallPackages(QStringList file_paths)
// Find remaining package files // Find remaining package files
file_paths = file_paths.filter(QRegExp(".*\\.pkg", Qt::CaseInsensitive)); file_paths = file_paths.filter(QRegExp(".*\\.pkg", Qt::CaseInsensitive));
if (file_paths.isEmpty()) if (!file_paths.isEmpty())
{ {
return; // Handle further installations with a timeout. Otherwise the source explorer instance is not usable during the following file processing.
QTimer::singleShot(0, [this, paths = std::move(file_paths)]()
{
HandlePackageInstallation(paths);
});
}
} }
std::vector<compat::package_info> infos; void main_window::HandlePackageInstallation(QStringList file_paths)
{
std::vector<compat::package_info> packages;
game_compatibility* compat = m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr; game_compatibility* compat = m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr;
@ -587,31 +594,17 @@ void main_window::InstallPackages(QStringList file_paths)
{ {
// Let the user choose the packages to install and select the order in which they shall be installed. // Let the user choose the packages to install and select the order in which they shall be installed.
pkg_install_dialog dlg(file_paths, compat, this); pkg_install_dialog dlg(file_paths, compat, this);
connect(&dlg, &QDialog::accepted, [&infos, &dlg]() connect(&dlg, &QDialog::accepted, [&packages, &dlg]()
{ {
infos = dlg.GetPathsToInstall(); packages = dlg.GetPathsToInstall();
}); });
dlg.exec(); dlg.exec();
} }
else else
{ {
infos.push_back(game_compatibility::GetPkgInfo(file_paths.front(), compat)); packages.push_back(game_compatibility::GetPkgInfo(file_paths.front(), compat));
} }
if (infos.empty())
{
return;
}
// Handle the actual installations with a timeout. Otherwise the source explorer instance is not usable during the following file processing.
QTimer::singleShot(0, [this, packages = std::move(infos)]()
{
HandlePackageInstallation(packages);
});
}
void main_window::HandlePackageInstallation(const std::vector<compat::package_info>& packages)
{
if (packages.empty()) if (packages.empty())
{ {
return; return;

2
rpcs3/rpcs3qt/main_window.h
View file

@ -140,7 +140,7 @@ private:
static bool InstallRapFile(const QString& path, const std::string& filename); static bool InstallRapFile(const QString& path, const std::string& filename);
void InstallPackages(QStringList file_paths = QStringList()); void InstallPackages(QStringList file_paths = QStringList());
void HandlePackageInstallation(const std::vector<compat::package_info>& packages); void HandlePackageInstallation(QStringList file_paths);
void InstallPup(QString filePath = ""); void InstallPup(QString filePath = "");
void HandlePupInstallation(QString file_path = ""); void HandlePupInstallation(QString file_path = "");