Merge branch 'develop' into RespectIgnoreArticles_JumpTo

This commit is contained in:
Stefan authored and GitHub committed 2020-02-02 17:49:15 +01:00
commit af64931fb9
2 files changed
+7 -2

No files matched your search

+1 -1
View File
@@ -369,7 +369,7 @@ namespace Vocaluxe.Screens
switch (keyEvent.Key)
{
case Keys.Space:
if (!_Sso.Selection.PartyMode)
if (!_Sso.Selection.PartyMode && !_Playlist.isPlaylistNameEditMode())
_ToggleSongOptions(ESongOptionsView.General);
break;
+6 -1
View File
@@ -972,6 +972,11 @@ namespace VocaluxeLib.Menu
return false;
}
public bool isPlaylistNameEditMode()
{
return _EditMode == EEditMode.PlaylistName;
}
private void _PrepareList()
{
_PlaylistElements.Clear();
@@ -1197,4 +1202,4 @@ namespace VocaluxeLib.Menu
}
#endregion ThemeEdit
}
}
}