games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-08 00:39:47 +02:00
Code Issues Releases Activity

Show message to player instead of crashing silently on extraction error

Browse Source
This commit is contained in:
Ivan Savenko 2024-06-26 11:18:59 +00:00
parent 2eeb6510c1
commit 5bc103f50e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/modManager/cmodmanager.cpp
View File

@ -26,9 +26,15 @@ namespace
{ {
QString detectModArchive(QString path, QString modName, std::vector<std::string> & filesToExtract) QString detectModArchive(QString path, QString modName, std::vector<std::string> & filesToExtract)
{ {
try {
ZipArchive archive(qstringToPath(path)); ZipArchive archive(qstringToPath(path));
filesToExtract = archive.listFiles(); filesToExtract = archive.listFiles();
}
catch (const std::runtime_error & e)
{
logGlobal->error("Failed to open zip archive. Reason: %s", e.what());
return "";
}
QString modDirName; QString modDirName;

2
lib/filesystem/CZipLoader.cpp
View File

@ -191,7 +191,7 @@ ZipArchive::ZipArchive(const boost::filesystem::path & from)
#endif #endif
if (archive == nullptr) if (archive == nullptr)
throw std::runtime_error("Failed to open file '" + from.string() + "' - unable to list files!"); throw std::runtime_error("Failed to open file '" + from.string());
} }
ZipArchive::~ZipArchive() ZipArchive::~ZipArchive()