summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-07-17 18:06:58 +0200
committerGitHub <noreply@github.com>2018-07-17 18:06:58 +0200
commitf1970e15b9450bff321f854d5ff1dbfc4bf80148 (patch)
tree34bc8c4710e4cb2dbdf3d25c65e11ea813c228b0
parent71b18acb05bd3f2046ad1ab78953c81f6526ce70 (diff)
parentbf37bd94b6c3604f760abea691973b4b2d09e622 (diff)
Merge pull request #20186 from Yar-Mukhamedov/master
A fix for the export templates installation error...
-rw-r--r--editor/export_template_manager.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp
index 541c848ca3..823e2f4617 100644
--- a/editor/export_template_manager.cpp
+++ b/editor/export_template_manager.cpp
@@ -228,7 +228,10 @@ void ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_
version = data_str;
}
- fc++;
+ if (file.get_file().size() != 0) {
+ fc++;
+ }
+
ret = unzGoToNextFile(pkg);
}
@@ -268,6 +271,11 @@ void ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_
String file = String(fname).get_file();
+ if (file.size() == 0) {
+ ret = unzGoToNextFile(pkg);
+ continue;
+ }
+
Vector<uint8_t> data;
data.resize(info.uncompressed_size);