1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Destroy EditorFilesystem/EditorSettings on test shutdown

Browse Source 
Otherwise asan complains if a test tries to use these.

Split off from https://github.com/godotengine/godot/pull/98909
This commit is contained in:
demolke 2024-11-29 21:22:49 +01:00
parent 0f20e67d8d
commit 35bb827d10
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_file_system.cpp
View File

@ -3556,5 +3556,9 @@ EditorFileSystem::EditorFileSystem() {
} }
EditorFileSystem::~EditorFileSystem() { EditorFileSystem::~EditorFileSystem() {
if (filesystem) {
memdelete(filesystem);
}
filesystem = nullptr;
ResourceSaver::set_get_resource_id_for_path(nullptr); ResourceSaver::set_get_resource_id_for_path(nullptr);
} }

1
editor/editor_paths.cpp
View File

@ -105,6 +105,7 @@ void EditorPaths::create() {
void EditorPaths::free() { void EditorPaths::free() {
ERR_FAIL_NULL(singleton); ERR_FAIL_NULL(singleton);
memdelete(singleton); memdelete(singleton);
singleton = nullptr;
} }
void EditorPaths::_bind_methods() { void EditorPaths::_bind_methods() {

3
tests/test_main.cpp
View File

@ -370,6 +370,9 @@ struct GodotTestCaseListener : public doctest::IReporter {
if (EditorSettings::get_singleton()) { if (EditorSettings::get_singleton()) {
EditorSettings::destroy(); EditorSettings::destroy();
} }
if (EditorPaths::get_singleton()) {
EditorPaths::free();
}
#endif // TOOLS_ENABLED #endif // TOOLS_ENABLED
Engine::get_singleton()->set_editor_hint(false); Engine::get_singleton()->set_editor_hint(false);