From a2376290d84f3d09c70cf069bd21ee4770c44325 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Thu, 2 Jul 2015 17:52:22 +0200
Subject: [PATCH] Bug 1950: fleeing units can guard the same turn. checking for
 UFL_FLEEING in can_start_guarding should make that impossible now.
 https://bugs.eressea.de/view.php?id=1950

---
 src/laws.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/laws.c b/src/laws.c
index f85c8c063..2854b2cc8 100755
--- a/src/laws.c
+++ b/src/laws.c
@@ -2675,7 +2675,7 @@ enum { E_GUARD_OK, E_GUARD_UNARMED, E_GUARD_NEWBIE, E_GUARD_FLEEING };
 
 static int can_start_guarding(const unit * u)
 {
-    if (u->status >= ST_FLEE)
+    if (u->status >= ST_FLEE || fval(u, UFL_FLEEING))
         return E_GUARD_FLEEING;
     if (fval(u_race(u), RCF_UNARMEDGUARD))
         return E_GUARD_OK;