From 8f4b76610751d047c14e855debdcf10717387d8e Mon Sep 17 00:00:00 2001 From: expwnent Date: Thu, 15 Jan 2015 18:13:19 -0500 Subject: [PATCH] EventManager: Fix a crash bug with EQUIPMENT_CHANGE event. --- library/modules/EventManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp index 9e356269a..46178d818 100644 --- a/library/modules/EventManager.cpp +++ b/library/modules/EventManager.cpp @@ -763,8 +763,6 @@ static void manageEquipmentEvent(color_ostream& out) { handle.eventHandler(out, (void*)&data); } } - if ( !hadEquipment ) - delete temp; //check for dropped items for ( auto b = v.begin(); b != v.end(); b++ ) { InventoryItem i = *b; @@ -777,6 +775,8 @@ static void manageEquipmentEvent(color_ostream& out) { handle.eventHandler(out, (void*)&data); } } + if ( !hadEquipment ) + delete temp; //update equipment vector& equipment = equipmentLog[unit->id];