From f7be1c60ae9f7bb50ecd2bc75cb891350acf3add Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 4 Aug 2018 00:35:33 -0500
Subject: [PATCH] Small Fix

---
 src/uncategorized/customSlave.tw    | 3 ++-
 src/utility/slaveCreationWidgets.tw | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index df6ab83e67f..be3343abd31 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -17,7 +17,8 @@
 <<elseif $customSlave.age < 20>>18-19 years old.
 <<elseif $customSlave.age < 25>>20-24 years old.
 <<elseif $customSlave.age < 30>>25-29 years old.
-<<elseif $customSlave.age < 40>>30-39 years old.
+<<elseif $customSlave.age < 40 && $retirementAge >= 40>>30-39 years old.
+<<elseif $customSlave.age < 40 && $retirementAge >= 30>>30+ years old.
 <<elseif $customSlave.age < 50 && $retirementAge >= 50>>40-49 years old.
 <<elseif $customSlave.age < 50 && $retirementAge >= 40>>40+ years old.
 <<elseif $customSlave.age < 60 && $retirementAge >= 60>>50-59 years old.
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index f650abb527b..f13d1a17c6b 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1342,7 +1342,8 @@
 		<<elseif $customSlave.age < 20>>18-19 years old.
 		<<elseif $customSlave.age < 25>>20-24 years old.
 		<<elseif $customSlave.age < 30>>25-29 years old.
-		<<elseif $customSlave.age < 40>>30-39 years old.
+		<<elseif $customSlave.age < 40 && $retirementAge >= 40>>30-39 years old.
+		<<elseif $customSlave.age < 40 && $retirementAge >= 30>>30+ years old.
 		<<elseif $customSlave.age < 50 && $retirementAge >= 50>>40-49 years old.
 		<<elseif $customSlave.age < 50 && $retirementAge >= 40>>40+ years old.
 		<<elseif $customSlave.age < 60 && $retirementAge >= 60>>50-59 years old.
-- 
GitLab