Merge branch 'unstable' into level-scripts

This commit is contained in:
MysterD 2022-04-06 01:39:15 -07:00
commit 5653a4f20d
1 changed files with 3 additions and 2 deletions

View File

@ -172,8 +172,9 @@ void network_receive_mod_list(struct Packet* p) {
packet_read(p, &file->size, sizeof(u64));
if (mod->isDirectory && !strstr(file->relativePath, "actors")) {
char tmp[SYS_MAX_PATH];
snprintf(tmp, SYS_MAX_PATH, "%s-%s", mod->relativePath, file->relativePath);
memcpy(file->relativePath, tmp, strlen(tmp) + 1);
if (snprintf(tmp, SYS_MAX_PATH, "%s-%s", mod->relativePath, file->relativePath) >= 0) {
memcpy(file->relativePath, tmp, strlen(tmp) + 1);
}
}
normalize_path(file->relativePath);
LOG_INFO(" '%s': %llu", file->relativePath, (u64)file->size);