From 2ae9f79f481ded03c8b901bd5bd0fc1dddd8fa1a Mon Sep 17 00:00:00 2001
From: HonorGoG <honorgog@titanpanel.org>
Date: Fri, 15 Nov 2019 16:21:59 -0800
Subject: [PATCH] - TitanClassicLocation: Corrected logic for new Zone/SubZone
 display. - Corrected bottom artwork for AllBlack and
 BlackPlusOne.

---
 .../AllBlack Skin/TitanPanelBackgroundBottom0.tga  |  Bin 338 -> 338 bytes
 .../TitanPanelBackgroundBottom0.tga                |  Bin 338 -> 338 bytes
 TitanClassicLocation/TitanClassicLocation.lua      |    6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/TitanClassic/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom0.tga b/TitanClassic/Artwork/Custom/AllBlack Skin/TitanPanelBackgroundBottom0.tga
index 9b7af2f33c3e84701f1a64aa36d635dc1ab069a7..42a0afbecb7d51a85878c14c2341e2cd81a20804 100644
GIT binary patch
delta 9
Qcmcb_bct!gi-`qU02Z<Yi~s-t

literal 338
dcmZQz;9`ISMg;~1j{iXJ|6xZkfP6$30szWAY3cv~

diff --git a/TitanClassic/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom0.tga b/TitanClassic/Artwork/Custom/BlackPlusOne Skin/TitanPanelBackgroundBottom0.tga
index ed78b71cefa5045669550989fae3dea86ef20611..f1ca360d7489bbd5e2ac22224fa911bca0908855 100644
GIT binary patch
delta 9
Qcmcb_bct!gi-`qU02Z<Yi~s-t

literal 338
fcmZQz;9`ISMg;~1j{hJoocIr74Fdw<BU-ZnS(0b$

diff --git a/TitanClassicLocation/TitanClassicLocation.lua b/TitanClassicLocation/TitanClassicLocation.lua
index 9c61ffc..2b5d62f 100755
--- a/TitanClassicLocation/TitanClassicLocation.lua
+++ b/TitanClassicLocation/TitanClassicLocation.lua
@@ -118,13 +118,13 @@ function TitanPanelLocationButton_GetButtonText(id)
 			if (button.zoneText == '') then
 				_, _, button.zoneText = C_Map.GetMapInfo(C_Map.GetBestMapUnit("player"));
 			end
-			if (ShowSubZoneText) then
+            locationText = TitanUtils_ToString(button.zoneText)..' '..locationText;
+		else
+			if (TitanGetVar(TITAN_LOCATION_ID, "ShowSubZoneText")) then
                 locationText = TitanUtils_ToString(button.zoneText)..' '..locationText;
             else
                 locationText = TitanUtils_ToString(button.zoneText..' - '..button.subZoneText)..' '..locationText;
             end
-		else
-			locationText = TitanUtils_ToString(button.subZoneText)..' '..locationText;
 		end
 	else
 		if button.px == 0 and button.py == 0 then
-- 
1.7.9.5