From: Carl Hetherington <cth@carlh.net>
Date: Thu, 9 Jun 2022 20:45:24 +0000 (+0200)
Subject: Add some missing locking.
X-Git-Tag: v2.16.14~7
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=1266a5149e056a17b4a9276ccf6ea4a79cc93610

Add some missing locking.
---

diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc
index e91b7bcc0..a85b271a8 100644
--- a/src/lib/text_content.cc
+++ b/src/lib/text_content.cc
@@ -445,7 +445,9 @@ TextContent::identifier () const
 void
 TextContent::add_font (shared_ptr<Font> font)
 {
-	DCPOMATIC_ASSERT(!get_font(font->id()));
+	boost::mutex::scoped_lock lm(_mutex);
+
+	DCPOMATIC_ASSERT(!get_font_unlocked(font->id()));
 	_fonts.push_back (font);
 	connect_to_fonts ();
 }
@@ -652,6 +654,14 @@ TextContent::take_settings_from (shared_ptr<const TextContent> c)
 
 shared_ptr<dcpomatic::Font>
 TextContent::get_font(string id) const
+{
+	boost::mutex::scoped_lock lm(_mutex);
+	return get_font_unlocked(id);
+}
+
+
+shared_ptr<dcpomatic::Font>
+TextContent::get_font_unlocked(string id) const
 {
 	auto iter = std::find_if(_fonts.begin(), _fonts.end(), [&id](shared_ptr<dcpomatic::Font> font) {
 		return font->id() == id;
@@ -668,6 +678,8 @@ TextContent::get_font(string id) const
 void
 TextContent::clear_fonts()
 {
+	boost::mutex::scoped_lock lm(_mutex);
+
 	_fonts.clear();
 }
 
diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 7ddb20b08..7c060cd48 100644
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -206,6 +206,7 @@ private:
 
 	void font_changed ();
 	void connect_to_fonts ();
+	std::shared_ptr<dcpomatic::Font> get_font_unlocked(std::string id) const;
 
 	std::list<boost::signals2::connection> _font_connections;