From ee2abfac94c976b0cb068c6a7c5232fee35ce5b0 Mon Sep 17 00:00:00 2001
From: Kyzentun <kyzentun@gmail.com>
Date: Wed, 24 Dec 2014 19:11:45 -0700
Subject: [PATCH] Fixed StepsDisplay commands to check for CustomDifficulty
 being an empty string.

---
 Themes/_fallback/metrics.ini | 10 +++++-----
 Themes/default/metrics.ini   | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 91808f5a5e..2a713fd427 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -1916,7 +1916,7 @@ LoadEdits=true
 Fallback="ScreenWithMenuElements"
 Class="ScreenSelectProfile"
 #
-ScreenOnCommand=%function(self) self:lockinput(3); end;
+ScreenOnCommand=%function(self) self:lockinput(1); end;
 #
 NextScreen=Branch.AfterSelectProfile()
 PrevScreen=Branch.TitleMenu()
@@ -2191,13 +2191,13 @@ FrameX=0
 FrameY=0
 FrameOnCommand=
 FrameLoadCommand=%function(self,param) local bFlip = param.PlayerState and param.PlayerState:GetPlayerNumber() ~= PLAYER_1; self:zoomx(bFlip and -1 or 1); end
-FrameSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) end end
+FrameSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) end end
 NumTicks=10
 MaxTicks=14
 TicksX=0
 TicksY=0
 TicksOnCommand=shadowlength,0;
-TicksSetCommand=%function(self,param) self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end
+TicksSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then  self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end end
 ShowTicks=false
 ShowMeter=true
 MeterFormatString="%i"
@@ -2205,12 +2205,12 @@ ZeroMeterString="?"
 MeterX=30
 MeterY=0
 MeterOnCommand=shadowlength,0
-MeterSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
+MeterSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowDescription=true
 DescriptionX=-10
 DescriptionY=0
 DescriptionOnCommand=shadowlength,0;uppercase,true;
-DescriptionSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
+DescriptionSetCommand=%function(self,param) if param.CustomDifficulty and param.CustomDifficulty ~= "" then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
 ShowCredit=false
 CreditX=0
 CreditY=0
diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini
index dc6b0a6018..9359a68128 100644
--- a/Themes/default/metrics.ini
+++ b/Themes/default/metrics.ini
@@ -422,7 +422,7 @@ MoveCommand=decelerate,0.05
 FrameX=
 
 FrameSetCommand=%function(self,param) \
-	if param.CustomDifficulty then \
+	if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
 		self:diffuse(ColorMidTone( CustomDifficultyToColor(param.CustomDifficulty) )); \
 	else \
 		self:diffuse(color('1,1,1,1')); \
@@ -436,7 +436,7 @@ ShowMeter=true
 MeterX=56
 MeterOnCommand=shadowlength,1;zoom,0.65;textglowmode,'TextGlowMode_Inner';
 MeterSetCommand=%function(self,param) \
-	if param.CustomDifficulty then \
+	if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
 		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
 		self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
 	end; \
@@ -457,7 +457,7 @@ DescriptionSetCommand=%function(self,param) \
 	if self:GetText() == "" then \
 		self:settext("Edit"); \
 	end; \
-	if param.CustomDifficulty then \
+	if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
 		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
 		self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
 	end; \
@@ -1167,7 +1167,7 @@ MeterX=56-32
 MeterY=0
 MeterOnCommand=shadowlength,1;textglowmode,'TextGlowMode_Inner'
 MeterSetCommand=%function(self,param) \
-	if param.CustomDifficulty then \
+	if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
 		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
 		self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
 	end; \
@@ -1193,7 +1193,7 @@ DescriptionSetCommand=%function(self,param) \
 	if self:GetText() == "" then \
 		self:settext("Edit"); \
 	end; \
-	if param.CustomDifficulty then \
+	if param.CustomDifficulty and param.CustomDifficulty ~= "" then \
 		self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \
 		self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \
 	end; \