1 files changed, 10 insertions, 18 deletions

diff --git a/modules/mono/mono_gd/gd_mono_log.cpp b/modules/mono/mono_gd/gd_mono_log.cpp
index 01a6521876..6ea3c5539e 100644
--- a/modules/mono/mono_gd/gd_mono_log.cpp
+++ b/modules/mono/mono_gd/gd_mono_log.cpp
@@ -77,23 +77,20 @@ static String make_text(const char *log_domain, const char *log_level, const cha
 }
 
 void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level, const char *message, mono_bool fatal, void *) {
-	FileAccess *f = GDMonoLog::get_singleton()->log_file;
-
 	if (GDMonoLog::get_singleton()->log_level_id >= get_log_level_id(log_level)) {
 		String text = make_text(log_domain, log_level, message);
 		text += "\n";
 
-		f->seek_end();
-		f->store_string(text);
+		GDMonoLog::get_singleton()->log_file->seek_end();
+		GDMonoLog::get_singleton()->log_file->store_string(text);
 	}
 
 	if (fatal) {
 		String text = make_text(log_domain, log_level, message);
 		ERR_PRINT("Mono: FATAL ERROR '" + text + "', ABORTING! Logfile: '" + GDMonoLog::get_singleton()->log_file_path + "'.");
 		// Make sure to flush before aborting
-		f->flush();
-		f->close();
-		memdelete(f);
+		GDMonoLog::get_singleton()->log_file->flush();
+		GDMonoLog::get_singleton()->log_file.unref();
 
 		abort();
 	}
@@ -101,8 +98,8 @@ void GDMonoLog::mono_log_callback(const char *log_domain, const char *log_level,
 
 bool GDMonoLog::_try_create_logs_dir(const String &p_logs_dir) {
 	if (!DirAccess::exists(p_logs_dir)) {
-		DirAccessRef diraccess = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-		ERR_FAIL_COND_V(!diraccess, false);
+		Ref<DirAccess> diraccess = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+		ERR_FAIL_COND_V(diraccess.is_null(), false);
 		Error logs_mkdir_err = diraccess->make_dir_recursive(p_logs_dir);
 		ERR_FAIL_COND_V_MSG(logs_mkdir_err != OK, false, "Failed to create mono logs directory.");
 	}
@@ -113,8 +110,8 @@ bool GDMonoLog::_try_create_logs_dir(const String &p_logs_dir) {
 void GDMonoLog::_delete_old_log_files(const String &p_logs_dir) {
 	static const uint64_t MAX_SECS = 5 * 86400; // 5 days
 
-	DirAccessRef da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
-	ERR_FAIL_COND(!da);
+	Ref<DirAccess> da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
+	ERR_FAIL_COND(da.is_null());
 
 	Error err = da->change_dir(p_logs_dir);
 	ERR_FAIL_COND_MSG(err != OK, "Cannot change directory to '" + p_logs_dir + "'.");
@@ -170,7 +167,7 @@ void GDMonoLog::initialize() {
 		log_file_path = logs_dir.plus_file(log_file_name);
 
 		log_file = FileAccess::open(log_file_path, FileAccess::WRITE);
-		if (!log_file) {
+		if (log_file.is_null()) {
 			ERR_PRINT("Mono: Cannot create log file at: " + log_file_path);
 		}
 	}
@@ -178,7 +175,7 @@ void GDMonoLog::initialize() {
 	mono_trace_set_level_string(log_level.get_data());
 	log_level_id = get_log_level_id(log_level.get_data());
 
-	if (log_file) {
+	if (log_file.is_valid()) {
 		OS::get_singleton()->print("Mono: Log file is: '%s'\n", log_file_path.utf8().get_data());
 		mono_trace_set_log_handler(mono_log_callback, this);
 	} else {
@@ -192,11 +189,6 @@ GDMonoLog::GDMonoLog() {
 
 GDMonoLog::~GDMonoLog() {
 	singleton = nullptr;
-
-	if (log_file) {
-		log_file->close();
-		memdelete(log_file);
-	}
 }
 
 #else