1.5: Fuckin' UE5... #38

Manually merged
williamjcm merged 126 commits from one-point-five into master 2024-07-22 11:06:13 +02:00
Showing only changes of commit 9f570a004b - Show all commits

View file

@ -20,6 +20,7 @@
#include <chrono>
#include <Corrade/Containers/GrowableArray.h>
#include <Corrade/Containers/Pair.h>
#include <Corrade/Containers/ScopeGuard.h>
#include <Corrade/Utility/Path.h>
#include <Corrade/Utility/String.h>
@ -243,9 +244,11 @@ BackupManager::scanSubdir(Containers::StringView subdir) {
zip_t* zip;
for(Containers::StringView file : files_view) {
Backup backup;
backup.filename = Utility::Path::join(full_subdir, file);
backup.filename = Utility::Path::join(subdir, file);
zip = zip_open(backup.filename.cbegin(), ZIP_RDONLY, &error_code);
auto full_path = Utility::Path::join(full_subdir, file);
zip = zip_open(full_path.cbegin(), ZIP_RDONLY, &error_code);
if(zip == nullptr) {
continue;
}