浏览代码

Merge pull request #22772 from Zylann/fix_load_memdelete_null

Don't delete FileAccess when it is null
Rémi Verschelde 7 年之前
父节点
当前提交
08dd035899
共有 3 个文件被更改,包括 0 次插入3 次删除
  1. 0 1
      core/io/image_loader.cpp
  2. 0 1
      modules/theora/video_stream_theora.cpp
  3. 0 1
      modules/webm/video_stream_webm.cpp

+ 0 - 1
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();
 	}
 

+ 0 - 1
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();
 	}
 

+ 0 - 1
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();
 	}