Merge pull request #77613 from mqrause/reload_fix

Fix crash when not wielding item from map/vehicle after reloading
CleverRaven · Nov 5, 2024 · dae649f · dae649f
2 parents b1c1cb9 + 0b7c796
commit dae649f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -4976,9 +4976,11 @@ void reload_activity_actor::finish( player_activity &act, Character &who )
         case 2:
         default:
             // In player inventory and player is wielding something.
-            loc.carrier()->add_msg_if_player( m_neutral,
-                                              _( "The %s no longer fits in your inventory so you drop it instead." ),
-                                              reloadable_name );
+            if( loc.carrier() ) {
+                loc.carrier()->add_msg_if_player( m_neutral,
+                                                  _( "The %s no longer fits in your inventory so you drop it instead." ),
+                                                  reloadable_name );
+            }
             get_map().add_item_or_charges( loc.pos_bub(), reloadable );
             loc.remove_item();
             break;