From b6ff29fdd8c6e09cd0103eefff8f095d4cb533fa Mon Sep 17 00:00:00 2001
From: Jonathan Payne <potentj@gmail.com>
Date: Sun, 31 Aug 2014 23:26:23 -0700
Subject: [PATCH] Make TwoPartSelection dialog hide on events

---
 .../BGAnimations/ScreenSelectMusic overlay.lua       | 12 +++++++++---
 .../BGAnimations/ScreenSelectMusic underlay.lua      |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua
index 55a4b7fb15..f7326baa14 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua	
@@ -53,9 +53,15 @@ for i=1,#num_players do
 		};
 	};
 end
+-- Lock input for half a second so that players don't accidentally start a song
+t[#t+1] = Def.Actor { 
+	StartSelectingStepsMessageCommand=function() SCREENMAN:GetTopScreen():lockinput(0.5); end;
+};
 
 --
-t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;visible,false;diffusealpha,0);
-t.StartSelectingStepsMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,1);
-t.StartSelectingSongMessageCommand=cmd(linear,0.2;visible,true;diffusealpha,0);
+t.InitCommand=cmd(Center;x,SCREEN_CENTER_X*1.5;diffusealpha,0);
+t.StartSelectingStepsMessageCommand=cmd(linear,0.2;diffusealpha,1);
+t.SongUnchosenMessageCommand=cmd(linear,0.2;diffusealpha,0);
+
+
 return t;
diff --git a/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua
index a2ea2dcdac..9cf9211740 100644
--- a/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua	
+++ b/Themes/default/BGAnimations/ScreenSelectMusic underlay.lua	
@@ -3,6 +3,7 @@ local t = Def.ActorFrame {
 		InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT);
 		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0);
 		StartSelectingStepsMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0.75);
+		SongUnchosenMessageCommand=cmd(stoptweening;linear,0.2;diffusealpha,0);
 	};
 };