From 97635f4bbae664f0eda4901f0967987d776e10cf Mon Sep 17 00:00:00 2001
From: Applevangelist <post@tniedermeier.com>
Date: Mon, 27 May 2024 17:07:12 +0200
Subject: [PATCH] xxx

---
 Moose Development/Moose/Core/ClientMenu.lua |  4 ++--
 Moose Development/Moose/Core/Menu.lua       |  1 +
 Moose Development/Moose/Ops/PlayerTask.lua  | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Moose Development/Moose/Core/ClientMenu.lua b/Moose Development/Moose/Core/ClientMenu.lua
index bcc348814..dae6195d2 100644
--- a/Moose Development/Moose/Core/ClientMenu.lua	
+++ b/Moose Development/Moose/Core/ClientMenu.lua	
@@ -20,7 +20,7 @@
 -- 
 -- @module Core.ClientMenu
 -- @image Core_Menu.JPG
--- last change: Apr 2024
+-- last change: May 2024
 
 -- TODO
 ----------------------------------------------------------------------------------------------------------------
@@ -691,7 +691,7 @@ function CLIENTMENUMANAGER:Propagate(Client)
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
       local playerunit = client:GetName()
-      local playergroup = client:GetGroup()
+      --local playergroup = client:GetGroup()
       local playername = client:GetPlayerName() or "none"
       if not knownunits[playerunit] then
         knownunits[playerunit] = true
diff --git a/Moose Development/Moose/Core/Menu.lua b/Moose Development/Moose/Core/Menu.lua
index 1ae35d35d..44c15b08d 100644
--- a/Moose Development/Moose/Core/Menu.lua	
+++ b/Moose Development/Moose/Core/Menu.lua	
@@ -1050,6 +1050,7 @@ do
   -- @param #MENU_GROUP_DELAYED self
   -- @return #MENU_GROUP_DELAYED
   function MENU_GROUP_DELAYED:Set()
+    if not self.GroupID then return end
     do
       if not self.MenuSet then
         missionCommands.addSubMenuForGroup( self.GroupID, self.MenuText, self.MenuParentPath )
diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua
index 8140be16d..2f02d9ce3 100644
--- a/Moose Development/Moose/Ops/PlayerTask.lua	
+++ b/Moose Development/Moose/Ops/PlayerTask.lua	
@@ -2123,10 +2123,12 @@ function PLAYERTASKCONTROLLER:_GetPlayerName(Client)
   local ttsplayername = nil
   if not self.customcallsigns[playername] then
     local playergroup = Client:GetGroup()
-    ttsplayername = playergroup:GetCustomCallSign(self.ShortCallsign,self.Keepnumber,self.CallsignTranslations)
-    local newplayername = self:_GetTextForSpeech(ttsplayername)
-    self.customcallsigns[playername] = newplayername
-    ttsplayername = newplayername
+    if playergroup ~= nil then
+      ttsplayername = playergroup:GetCustomCallSign(self.ShortCallsign,self.Keepnumber,self.CallsignTranslations)
+      local newplayername = self:_GetTextForSpeech(ttsplayername)
+      self.customcallsigns[playername] = newplayername
+      ttsplayername = newplayername
+    end
   else
     ttsplayername = self.customcallsigns[playername]
   end