godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48863 from Ev1lbl0w/bugfix-zip_import

Browse Source 
Fix zip_root not being defined when importing by drag&drop
This commit is contained in:
Rémi Verschelde 2021-05-20 14:34:04 +02:00 committed by GitHub
commit f2d55f3c0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
editor/project_manager.cpp
View File

@ -100,7 +100,6 @@ private:
FileDialog *fdialog_install;
String zip_path;
String zip_title;
String zip_root;
AcceptDialog *dialog_error;
String fav_dir;
@ -201,9 +200,7 @@ private:
char fname[16384];
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
String fname_str = String(fname);
if (fname_str.ends_with("project.godot")) {
zip_root = fname_str.substr(0, fname_str.rfind("project.godot"));
if (String(fname).ends_with("project.godot")) {
break;
}
@ -524,7 +521,24 @@ private:
return;
}
// Find the zip_root
String zip_root;
int ret = unzGoToFirstFile(pkg);
while (ret == UNZ_OK) {
unz_file_info info;
char fname[16384];
unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
String name = fname;
if (name.ends_with("project.godot")) {
zip_root = name.substr(0, name.rfind("project.godot"));
break;
}
ret = unzGoToNextFile(pkg);
}
ret = unzGoToFirstFile(pkg);
Vector<String> failed_files;