From 1aeb7b3ff6bffa406902a34f329fcc390a7da184 Mon Sep 17 00:00:00 2001
From: FlightControl <sven.van.de.velde@telenet.be>
Date: Mon, 26 Jun 2017 19:37:31 +0200
Subject: [PATCH] Fixed issue #566 and #567

---
 Moose Development/Moose/Tasking/Task.lua | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua
index c6180aad9..ba8c7c613 100644
--- a/Moose Development/Moose/Tasking/Task.lua	
+++ b/Moose Development/Moose/Tasking/Task.lua	
@@ -702,9 +702,11 @@ end
 -- @return #TASK
 function TASK:SetMenuForGroup( TaskGroup, MenuTime )
 
-  self:SetPlannedMenuForGroup( TaskGroup, MenuTime )
-  if self:IsGroupAssigned( TaskGroup ) then
-    self:SetAssignedMenuForGroup( TaskGroup, MenuTime )
+  if self:IsStatePlanned() or self:IsStateAssigned() then
+    self:SetPlannedMenuForGroup( TaskGroup, MenuTime )
+    if self:IsGroupAssigned( TaskGroup ) then
+      self:SetAssignedMenuForGroup( TaskGroup, MenuTime )
+    end
   end
 end