Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into curse

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp
index fd374246..a54a3c86 100644
--- a/launcher/ui/dialogs/ExportPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportPackDialog.cpp
@@ -60,8 +60,9 @@ ExportPackDialog::ExportPackDialog(InstancePtr instance, QWidget* parent, ModPla
     // use the game root - everything outside cannot be exported
     const QDir root(instance->gameRoot());
     proxy = new FileIgnoreProxy(instance->gameRoot(), this);
+    proxy->ignoreFilesWithPath().insert({ "logs", "crash-reports" });
+    proxy->ignoreFilesWithName().append({ ".DS_Store", "thumbs.db", "Thumbs.db" });
     proxy->setSourceModel(model);
-    proxy->setFilterRegularExpression("^(?!(\\.DS_Store)|([tT]humbs\\.db)).+$");
 
     const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
 
@@ -114,10 +115,10 @@ void ExportPackDialog::done(int result)
         Task* task;
         if (m_provider == ModPlatform::ResourceProvider::MODRINTH)
             task = new ModrinthPackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
-                                              [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+                                              std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
         else
             task = new FlamePackExportTask(ui->name->text(), ui->version->text(), ui->summary->text(), instance, output,
-                                           [this](const QString& path) { return proxy->blockedPaths().covers(path); });
+                                           std::bind(&FileIgnoreProxy::filterFile, proxy, std::placeholders::_1));
 
         connect(task, &Task::failed,
                 [this](const QString reason) { CustomMessageBox::selectable(this, tr("Error"), reason, QMessageBox::Critical)->show(); });