Skip to content

Commit

Permalink
Destroy EditorFilesystem/EditorSettings on test shutdown
Browse files Browse the repository at this point in the history
Otherwise asan complains if a test tries to use these.

Split off from godotengine#98909
  • Loading branch information
demolke committed Dec 2, 2024
1 parent 0f20e67 commit 35bb827
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions editor/editor_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3556,5 +3556,9 @@ EditorFileSystem::EditorFileSystem() {
}

EditorFileSystem::~EditorFileSystem() {
if (filesystem) {
memdelete(filesystem);
}
filesystem = nullptr;
ResourceSaver::set_get_resource_id_for_path(nullptr);
}
1 change: 1 addition & 0 deletions editor/editor_paths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ void EditorPaths::create() {
void EditorPaths::free() {
ERR_FAIL_NULL(singleton);
memdelete(singleton);
singleton = nullptr;
}

void EditorPaths::_bind_methods() {
Expand Down
3 changes: 3 additions & 0 deletions tests/test_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,9 @@ struct GodotTestCaseListener : public doctest::IReporter {
if (EditorSettings::get_singleton()) {
EditorSettings::destroy();
}
if (EditorPaths::get_singleton()) {
EditorPaths::free();
}
#endif // TOOLS_ENABLED

Engine::get_singleton()->set_editor_hint(false);
Expand Down

0 comments on commit 35bb827

Please sign in to comment.