godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix zip_root not being defined when importing by drag&drop

Browse Source
This commit is contained in:
Ev1lbl0w
2021-05-19 22:34:33 +01:00
parent d0aaf4a1fd
commit 056deefa55
1 changed files with 18 additions and 4 deletions
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; FileDialog *fdialog_install;
String zip_path; String zip_path;
String zip_title; String zip_title;
String zip_root;
AcceptDialog *dialog_error; AcceptDialog *dialog_error;
String fav_dir; String fav_dir;
@@ -201,9 +200,7 @@ private:
char fname[16384]; char fname[16384];
ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0); ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, nullptr, 0, nullptr, 0);
String fname_str = String(fname); if (String(fname).ends_with("project.godot")) {
if (fname_str.ends_with("project.godot")) {
zip_root = fname_str.substr(0, fname_str.rfind("project.godot"));
break; break;
} }
@@ -524,7 +521,24 @@ private:
return; return;
} }
// Find the zip_root
String zip_root;
int ret = unzGoToFirstFile(pkg); 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; Vector<String> failed_files;