From def274a583909a695580509028bd2f393b9c5cf9 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 13 Aug 2015 19:02:48 +0300 Subject: Fix segfault caused by a8e238ed06ee8285ed4459e9deda3117419837f6 --- src/map.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/map.cpp b/src/map.cpp index 38a700e3c..76a558d43 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1499,8 +1499,8 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks, } block_count_all = mapblock_queue.size(); // Delete old blocks, and blocks over the limit from the memory - while (mapblock_queue.size() > max_loaded_blocks - || mapblock_queue.top().block->getUsageTimer() > unload_timeout) { + while (!mapblock_queue.empty() && (mapblock_queue.size() > max_loaded_blocks + || mapblock_queue.top().block->getUsageTimer() > unload_timeout)) { TimeOrderedMapBlock b = mapblock_queue.top(); mapblock_queue.pop(); -- cgit v1.2.3