1 files changed, 8 insertions, 9 deletions

@@ -584,6 +584,8 @@ void ResetReachabilityRequirements() {
 }
 
 void RecalculateReachability() {
+  std::lock_guard reachability_guard(GetState().reachability_mutex);
+
   StateCalculator state_calculator({.start = GD_GetRoomByName("Menu")});
   state_calculator.Calculate();
 
@@ -616,14 +618,11 @@ void RecalculateReachability() {
   std::set<int> reachable_paintings = state_calculator.GetReachablePaintings();
   std::map<int, std::map<std::string, bool>> door_reports =
       state_calculator.GetDoorReports();
-
-  {
-    std::lock_guard reachability_guard(GetState().reachability_mutex);
-    std::swap(GetState().reachability, new_reachability);
-    std::swap(GetState().reachable_doors, new_reachable_doors);
-    std::swap(GetState().reachable_paintings, reachable_paintings);
-    std::swap(GetState().door_reports, door_reports);
-  }
+  
+  std::swap(GetState().reachability, new_reachability);
+  std::swap(GetState().reachable_doors, new_reachable_doors);
+  std::swap(GetState().reachable_paintings, reachable_paintings);
+  std::swap(GetState().door_reports, door_reports);
 }
 
 bool IsLocationReachable(int location_id) {
@@ -651,5 +650,5 @@ bool IsPaintingReachable(int painting_id) {
 const std::map<std::string, bool>& GetDoorRequirements(int door_id) {
   std::lock_guard reachability_guard(GetState().reachability_mutex);
 
-  return GetState().door_reports[door_id];
+  return GetState().door_reports.at(door_id);
 }