diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-05 21:41:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 21:41:57 +0200 |
| commit | 08dd03589931859b8e038e831e71f060584fc6d3 (patch) | |
| tree | 582644ec006e8326afcf75cf8fbfb0a578565d62 | |
| parent | f5a77f7bdd6d59f32f7d9aad81dabc5733221275 (diff) | |
| parent | c1bba054e623b42d05bc0ff9e350a1fc353f6860 (diff) | |
Merge pull request #22772 from Zylann/fix_load_memdelete_null
Don't delete FileAccess when it is null
| -rw-r--r-- | core/io/image_loader.cpp | 1 | ||||
| -rw-r--r-- | modules/theora/video_stream_theora.cpp | 1 | ||||
| -rw-r--r-- | modules/webm/video_stream_webm.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp index f202320043..3ae9ff676c 100644 --- a/core/io/image_loader.cpp +++ b/core/io/image_loader.cpp @@ -118,7 +118,6 @@ RES ResourceFormatLoaderImage::load(const String &p_path, const String &p_origin if (r_error) { *r_error = ERR_CANT_OPEN; } - memdelete(f); return RES(); } diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index d72d74cf79..2a6bb0783b 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/modules/theora/video_stream_theora.cpp @@ -730,7 +730,6 @@ RES ResourceFormatLoaderTheora::load(const String &p_path, const String &p_origi if (r_error) { *r_error = ERR_CANT_OPEN; } - memdelete(f); return RES(); } diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp index d9a6ece085..675fc97b55 100644 --- a/modules/webm/video_stream_webm.cpp +++ b/modules/webm/video_stream_webm.cpp @@ -453,7 +453,6 @@ RES ResourceFormatLoaderWebm::load(const String &p_path, const String &p_origina if (r_error) { *r_error = ERR_CANT_OPEN; } - memdelete(f); return RES(); } |