1 files changed, 25 insertions, 36 deletions

diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp
index 79a1500129..ebd5b02dbc 100644
--- a/scene/resources/dynamic_font.cpp
+++ b/scene/resources/dynamic_font.cpp
@@ -990,7 +990,7 @@ void DynamicFont::_bind_methods() {
 	BIND_ENUM_CONSTANT(SPACING_SPACE);
 }
 
-Mutex *DynamicFont::dynamic_font_mutex = NULL;
+Mutex DynamicFont::dynamic_font_mutex;
 
 SelfList<DynamicFont>::List *DynamicFont::dynamic_fonts = NULL;
 
@@ -1004,29 +1004,21 @@ DynamicFont::DynamicFont() :
 	spacing_char = 0;
 	spacing_space = 0;
 	outline_color = Color(1, 1, 1);
-	if (dynamic_font_mutex) {
-		dynamic_font_mutex->lock();
-		dynamic_fonts->add(&font_list);
-		dynamic_font_mutex->unlock();
-	}
+
+	MutexLock lock(dynamic_font_mutex);
+	dynamic_fonts->add(&font_list);
 }
 
 DynamicFont::~DynamicFont() {
-	if (dynamic_font_mutex) {
-		dynamic_font_mutex->lock();
-		dynamic_fonts->remove(&font_list);
-		dynamic_font_mutex->unlock();
-	}
+	MutexLock lock(dynamic_font_mutex);
+	dynamic_fonts->remove(&font_list);
 }
 
 void DynamicFont::initialize_dynamic_fonts() {
 	dynamic_fonts = memnew(SelfList<DynamicFont>::List());
-	dynamic_font_mutex = Mutex::create();
 }
 
 void DynamicFont::finish_dynamic_fonts() {
-	memdelete(dynamic_font_mutex);
-	dynamic_font_mutex = NULL;
 	memdelete(dynamic_fonts);
 	dynamic_fonts = NULL;
 }
@@ -1034,39 +1026,36 @@ void DynamicFont::finish_dynamic_fonts() {
 void DynamicFont::update_oversampling() {
 
 	Vector<Ref<DynamicFont> > changed;
+	{
+		MutexLock lock(dynamic_font_mutex);
 
-	if (dynamic_font_mutex)
-		dynamic_font_mutex->lock();
-
-	SelfList<DynamicFont> *E = dynamic_fonts->first();
-	while (E) {
+		SelfList<DynamicFont> *E = dynamic_fonts->first();
+		while (E) {
 
-		if (E->self()->data_at_size.is_valid()) {
-			E->self()->data_at_size->update_oversampling();
+			if (E->self()->data_at_size.is_valid()) {
+				E->self()->data_at_size->update_oversampling();
 
-			if (E->self()->outline_data_at_size.is_valid()) {
-				E->self()->outline_data_at_size->update_oversampling();
-			}
+				if (E->self()->outline_data_at_size.is_valid()) {
+					E->self()->outline_data_at_size->update_oversampling();
+				}
 
-			for (int i = 0; i < E->self()->fallback_data_at_size.size(); i++) {
-				if (E->self()->fallback_data_at_size[i].is_valid()) {
-					E->self()->fallback_data_at_size.write[i]->update_oversampling();
+				for (int i = 0; i < E->self()->fallback_data_at_size.size(); i++) {
+					if (E->self()->fallback_data_at_size[i].is_valid()) {
+						E->self()->fallback_data_at_size.write[i]->update_oversampling();
 
-					if (E->self()->has_outline() && E->self()->fallback_outline_data_at_size[i].is_valid()) {
-						E->self()->fallback_outline_data_at_size.write[i]->update_oversampling();
+						if (E->self()->has_outline() && E->self()->fallback_outline_data_at_size[i].is_valid()) {
+							E->self()->fallback_outline_data_at_size.write[i]->update_oversampling();
+						}
 					}
 				}
+
+				changed.push_back(Ref<DynamicFont>(E->self()));
 			}
 
-			changed.push_back(Ref<DynamicFont>(E->self()));
+			E = E->next();
 		}
-
-		E = E->next();
 	}
 
-	if (dynamic_font_mutex)
-		dynamic_font_mutex->unlock();
-
 	for (int i = 0; i < changed.size(); i++) {
 		changed.write[i]->emit_changed();
 	}
@@ -1074,7 +1063,7 @@ void DynamicFont::update_oversampling() {
 
 /////////////////////////
 
-RES ResourceFormatLoaderDynamicFont::load(const String &p_path, const String &p_original_path, Error *r_error) {
+RES ResourceFormatLoaderDynamicFont::load(const String &p_path, const String &p_original_path, Error *r_error, bool p_use_sub_threads, float *r_progress) {
 
 	if (r_error)
 		*r_error = ERR_FILE_CANT_OPEN;