From 5bb91646d78bc05985acbc7c41a57d0699e863b8 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Thu, 4 May 2017 14:23:10 +0200 Subject: [PATCH] Updates --- Moose Development/Moose/Core/Menu.lua | 4 ++-- Moose Development/Moose/Tasking/Task.lua | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua index 1b15cbe06..c38f763d4 100644 --- a/Moose Development/Moose/Core/Menu.lua +++ b/Moose Development/Moose/Core/Menu.lua @@ -91,7 +91,7 @@ do -- MENU_BASE -- @param #boolean RemoveParent If true, the parent menu is automatically removed when this menu is the last child menu of that parent @{Menu}. -- @return #MENU_BASE function MENU_BASE:SetRemoveParent( RemoveParent ) - self:F( { RemoveParent } ) + self:F2( { RemoveParent } ) self.MenuRemoveParent = RemoveParent return self end @@ -902,7 +902,7 @@ do if self.ParentMenu and self.ParentMenu.Menus then self.ParentMenu.Menus[MenuText] = self self.ParentMenu.MenuCount = self.ParentMenu.MenuCount + 1 - self:F( { ParentMenu.Menus, MenuText } ) + self:F2( { ParentMenu.Menus, MenuText } ) end end diff --git a/Moose Development/Moose/Tasking/Task.lua b/Moose Development/Moose/Tasking/Task.lua index 70d97867d..78fea4073 100644 --- a/Moose Development/Moose/Tasking/Task.lua +++ b/Moose Development/Moose/Tasking/Task.lua @@ -724,7 +724,12 @@ end -- @param #TASK self function TASK:MenuTaskAbort( TaskGroup ) - self:Abort() + for PlayerUnitName, PlayerUnit in pairs( TaskGroup:GetUnits() ) do + self:AbortUnit( PlayerUnit ) + end + + self:GetMission():GetCommandCenter():GetPositionable():MessageToSetGroup( "Abort", 15, self.SetGroup ) + end