CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'update-quazip' of git://github.com/Scrumplex/PolyMC into develop

Browse Source
This commit is contained in:
swirl
2022-02-03 14:14:12 -05:00
parent 2c62a34c2f c4cb7ddc4f
commit 076efc4cb2
19 changed files with 167 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/ui/dialogs/ExportInstanceDialog.cpp
View File

@ -403,7 +403,13 @@ bool ExportInstanceDialog::doExport()
auto & blocked = proxyModel->blockedPaths();
using std::placeholders::_1;
if (!JlCompress::compressDir(output, m_instance->instanceRoot(), name, std::bind(&SeparatorPrefixTree<'/'>::covers, blocked, _1)))
auto files = QFileInfoList();
if (!MMCZip::collectFileListRecursively(m_instance->instanceRoot(), nullptr, &files,
std::bind(&SeparatorPrefixTree<'/'>::covers, blocked, _1))) {
QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
return false;
}
if (!MMCZip::compressDirFiles(output, m_instance->instanceRoot(), files))
{
QMessageBox::warning(this, tr("Error"), tr("Unable to export instance"));
return false;