Prevent crash in SpriteChange::clear_stay_action when WorldMapSector::current is NULL

tobbi · tobbi · commit 76a2bae715fa · 2025-08-03T03:39:35.000+02:00
Possibly related to #3130 and #3328
diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
@@ -67,9 +67,10 @@ SpriteChange::clear_stay_action(bool propagate)
   m_in_stay_action = false;
 
   // if we are in a stay_group, also clear all stay actions in this group
-  if (!m_stay_group.empty() && propagate)
+  auto sector = WorldMapSector::current();
+  if (!m_stay_group.empty() && propagate && sector != nullptr)
   {
-    for (SpriteChange& sc : WorldMapSector::current()->get_objects_by_type<SpriteChange>())
+    for (SpriteChange& sc : sector->get_objects_by_type<SpriteChange>())
     {
       if (sc.m_stay_group != m_stay_group) continue;
       sc.m_in_stay_action = false;

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,10 @@ SpriteChange::clear_stay_action(bool propagate)`
`67`	`67`	`m_in_stay_action = false;`
`68`	`68`
`69`	`69`	`// if we are in a stay_group, also clear all stay actions in this group`
`70`		`- if (!m_stay_group.empty() && propagate)`
	`70`	`+ auto sector = WorldMapSector::current();`
	`71`	`+ if (!m_stay_group.empty() && propagate && sector != nullptr)`
`71`	`72`	`{`
`72`		`- for (SpriteChange& sc : WorldMapSector::current()->get_objects_by_type<SpriteChange>())`
	`73`	`+ for (SpriteChange& sc : sector->get_objects_by_type<SpriteChange>())`
`73`	`74`	`{`
`74`	`75`	`if (sc.m_stay_group != m_stay_group) continue;`
`75`	`76`	`sc.m_in_stay_action = false;`