Merge branch 'master' into options-footer

This commit is contained in:
Thomas Müller
2017-03-06 20:01:51 +01:00
committed by GitHub
10 changed files with 22 additions and 8 deletions

View File

@ -192,7 +192,7 @@ namespace osu.Game
private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
{
if (args.Repeat) return false;
if (args.Repeat || intro == null) return false;
switch (args.Key)
{