From e5f1d19352dbaafab96538b91fad0ce11cf0d046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 10 Jan 2019 12:45:57 +0100 Subject: Consistency in resource format saver/loader de-registration Some used 'is_valid()' checks, others not. Validity is already checked in 'unref()', and 'remove_resource_format_*()' has an ERR_FAIL condition on 'is_null()' already (which shouldn't happen since we're only unregistering things that we previously registered. Also add missing GDCLASS statement in ResourceFormatLoaderVideoStreamGDNative, missed in #20552 which was last amended before #19501 was merged. --- modules/mono/register_types.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'modules/mono') diff --git a/modules/mono/register_types.cpp b/modules/mono/register_types.cpp index ba008dffd4..3607b6f8b3 100644 --- a/modules/mono/register_types.cpp +++ b/modules/mono/register_types.cpp @@ -65,15 +65,11 @@ void unregister_mono_types() { if (script_language_cs) memdelete(script_language_cs); - if (resource_loader_cs.is_valid()) { - ResourceLoader::remove_resource_format_loader(resource_loader_cs); - resource_loader_cs.unref(); - } - - if (resource_saver_cs.is_valid()) { - ResourceSaver::remove_resource_format_saver(resource_saver_cs); - resource_saver_cs.unref(); - } + ResourceLoader::remove_resource_format_loader(resource_loader_cs); + resource_loader_cs.unref(); + + ResourceSaver::remove_resource_format_saver(resource_saver_cs); + resource_saver_cs.unref(); if (_godotsharp) memdelete(_godotsharp); -- cgit v1.2.3