asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash when exporting projects with shared libraries

Browse source
This commit is contained in:
Haoyu Qiu 2022-03-23 13:53:32 +08:00
parent 3586f559d1
commit 680bcef825
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/io/dir_access.h
View file

@ -137,6 +137,10 @@ struct DirAccessRef {
DirAccess *f = nullptr; DirAccess *f = nullptr;
DirAccessRef(DirAccess *fa) { f = fa; } DirAccessRef(DirAccess *fa) { f = fa; }
DirAccessRef(DirAccessRef &&other) {
f = other.f;
other.f = nullptr;
}
~DirAccessRef() { ~DirAccessRef() {
if (f) { if (f) {
memdelete(f); memdelete(f);

4
core/io/file_access.h
View file

@ -188,6 +188,10 @@ struct FileAccessRef {
operator FileAccess *() { return f; } operator FileAccess *() { return f; }
FileAccessRef(FileAccess *fa) { f = fa; } FileAccessRef(FileAccess *fa) { f = fa; }
FileAccessRef(FileAccessRef &&other) {
f = other.f;
other.f = nullptr;
}
~FileAccessRef() { ~FileAccessRef() {
if (f) { if (f) {
memdelete(f); memdelete(f);

1
editor/editor_export.cpp
View file

@ -1878,7 +1878,6 @@ Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_pr
if (err == OK && !so_files.is_empty()) { if (err == OK && !so_files.is_empty()) {
// If shared object files, copy them. // If shared object files, copy them.
da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
for (int i = 0; i < so_files.size() && err == OK; i++) { for (int i = 0; i < so_files.size() && err == OK; i++) {
String src_path = ProjectSettings::get_singleton()->globalize_path(so_files[i].path); String src_path = ProjectSettings::get_singleton()->globalize_path(so_files[i].path);
String target_path; String target_path;