From cb257dd0206d237722ec3b6588aaa06defed9e84 Mon Sep 17 00:00:00 2001 From: freenity Date: Sat, 15 Nov 2008 20:08:41 +0000 Subject: [PATCH] Null pointer fix. This was SVN commit r6481. --- source/simulation/Simulation.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/simulation/Simulation.cpp b/source/simulation/Simulation.cpp index 652179b012..ca4f27afb6 100644 --- a/source/simulation/Simulation.cpp +++ b/source/simulation/Simulation.cpp @@ -267,10 +267,14 @@ void QueueOrder(const CEntityOrder& order, const std::vector &entities, for (it = entities.begin(); it < entities.end(); it++) { - if( !isQueued ) - (*it)->ClearOrders(); + if (*it) + { + if( !isQueued ) { + (*it)->ClearOrders(); + } - (*it)->PushOrder( order ); + (*it)->PushOrder( order ); + } } }