Merge branch 'develop' into fix-implicit-fallthrough

Signed-off-by: PandaNinjas <admin@malwarefight.wip.la>

1 files changed, 3 insertions, 1 deletions

diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp
index 239873f6..b302f7ba 100644
--- a/launcher/ui/dialogs/ExportMrPackDialog.cpp
+++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp
@@ -52,6 +52,8 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent)
     // 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);
 
     const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden);
@@ -98,7 +100,7 @@ void ExportMrPackDialog::done(int result)
             return;
 
         ModrinthPackExportTask task(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(); });