From f1ec6ec6894ab94a410043ea95d67911fc518717 Mon Sep 17 00:00:00 2001
From: lewri <lewri@users.noreply.github.com>
Date: Sat, 30 Mar 2024 12:37:11 +0000
Subject: [PATCH] Remove queued StaffRise messages

On sack and death
---
 CorsixTH/Lua/entities/humanoids/staff.lua | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/CorsixTH/Lua/entities/humanoids/staff.lua b/CorsixTH/Lua/entities/humanoids/staff.lua
index 830cda9a6..89c73721c 100644
--- a/CorsixTH/Lua/entities/humanoids/staff.lua
+++ b/CorsixTH/Lua/entities/humanoids/staff.lua
@@ -183,8 +183,8 @@ function Staff:checkIfWaitedTooLong()
           break
         end
       end
-      --If the hospital policy is set to automatically grant wage increases, grant the requested raise
-      --instead of firing the staff member
+      -- If the hospital policy is set to automatically grant wage increases, grant
+      -- the requested raise instead of firing the staff member
       if self.hospital.policies.grant_wage_increase then
         local amount = math.floor(math.max(self.profile.wage * 1.1, (self.profile:getFairWage(self.world) + self.profile.wage) / 2) - self.profile.wage)
         self.quitting_in = nil
@@ -193,12 +193,12 @@ function Staff:checkIfWaitedTooLong()
         return
       end
 
-      -- Plays the sack sound, but maybe it's good that you hear a staff member leaving?
+      -- else: The staff member is sacked
       if staff_rise_window then
         staff_rise_window:fireStaff()
-      else
-        self:fire()
+        return
       end
+      self:fire()
     end
   end
 end
@@ -234,6 +234,11 @@ function Staff:isResting()
   end
 end
 
+--! Destroys any raise request window that may be queued
+function Staff:removeQueuedStaffMessage()
+  self.hospital:removeMessage(self)
+end
+
 -- Immediately terminate the staff member's employment.
 function Staff:fire()
   if self.fired then
@@ -245,6 +250,7 @@ function Staff:fire()
   if staff_window and staff_window.staff == self then
       staff_window:close()
   end
+  self:removeQueuedStaffMessage()
   self.hospital:spendMoney(self.profile.wage, _S.transactions.severance .. ": "
       .. self.profile:getFullName())
   self.world.ui:playSound("sack.wav")
@@ -266,6 +272,8 @@ function Staff:fire()
 end
 
 function Staff:die()
+  -- Dismiss any queued staff raise requests
+  self:removeQueuedStaffMessage()
   -- Update the staff management screen (if present) accordingly
   local window = self.world.ui:getWindow(UIStaffManagement)
   if window then