diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index b52c88d1..eea5afd1 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -284,7 +284,7 @@ namespace Vocaluxe.Screens if (_Buttons[_ButtonBack].Selected) CGraphics.FadeTo(EScreen.Song); - else + else if (_Buttons[_ButtonStart].Selected) _StartSong(); break; diff --git a/VocaluxeLib/Menu/CObjectInteractions.cs b/VocaluxeLib/Menu/CObjectInteractions.cs index ee91fa59..f46a2d00 100644 --- a/VocaluxeLib/Menu/CObjectInteractions.cs +++ b/VocaluxeLib/Menu/CObjectInteractions.cs @@ -600,13 +600,13 @@ namespace VocaluxeLib.Menu { case EDirection.Up: case EDirection.Down: - if (!other.X.IsInRange(current.X, current.Right) && !other.Right.IsInRange(current.X, current.Right)) + if (!other.X.IsInRange(current.X, current.Right) && !other.Right.IsInRange(current.X, current.Right) && !current.X.IsInRange(other.X, other.Right)) return float.MaxValue; break; case EDirection.Left: case EDirection.Right: - if (!other.Y.IsInRange(current.Y, current.Bottom) && !other.Bottom.IsInRange(current.Y, current.Bottom)) + if (!other.Y.IsInRange(current.Y, current.Bottom) && !other.Bottom.IsInRange(current.Y, current.Bottom) && !current.Y.IsInRange(other.Y, other.Bottom)) return float.MaxValue; break; }