From fd7ec2da911ff6eeb62035ad4457f1e5179dbaa1 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 28 Jul 2012 14:44:18 +0300 Subject: [PATCH] Fix inventory segfault when rollback recording is disabled --- src/inventorymanager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index 85668d64..7fc8c8ce 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -355,7 +355,7 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Record rollback information */ - if(!ignore_rollback) + if(!ignore_rollback && gamedef->rollback()) { IRollbackReportSink *rollback = gamedef->rollback(); @@ -628,7 +628,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame /* Record rollback information */ - if(!ignore_src_rollback) + if(!ignore_src_rollback && gamedef->rollback()) { IRollbackReportSink *rollback = gamedef->rollback();