Fixed remaining thread unsafe APState/IPCState reads

Still would like to add some kind of wrapper object that TrackerState could use to read APState without locking, since it'll only ever be called from the thread that would do the mutating, but this is fine for now.

1 files changed, 5 insertions, 3 deletions

@@ -675,7 +675,9 @@ bool AP_IsPaintingShuffle() {
   return GetState().painting_shuffle;
 }
 
-const std::map<std::string, std::string>& AP_GetPaintingMapping() {
+std::map<std::string, std::string> AP_GetPaintingMapping() {
+  std::lock_guard state_guard(GetState().state_mutex);
+
   return GetState().painting_mapping;
 }
 
@@ -685,7 +687,7 @@ bool AP_IsPaintingMappedTo(const std::string& painting_id) {
   return GetState().painting_codomain.count(painting_id);
 }
 
-const std::set<std::string>& AP_GetCheckedPaintings() {
+std::set<std::string> AP_GetCheckedPaintings() {
   return GetState().GetCheckedPaintings();
 }
 
@@ -778,7 +780,7 @@ bool AP_IsSunwarpShuffle() {
   return GetState().sunwarp_shuffle;
 }
 
-const std::map<int, SunwarpMapping>& AP_GetSunwarpMapping() {
+std::map<int, SunwarpMapping> AP_GetSunwarpMapping() {
   return GetState().sunwarp_mapping;
 }