On change of Tabs to on it will go out of any category

Auto reformat
This commit is contained in:
Flamefire committed 2013-04-29 02:24:36 +02:00
1 parent cf0fd9dbed
commit 69c36362f5
15 files changed
+168 -39

No files matched your search

@@ -559,7 +559,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
if (!_Initialized)
return false;
if (CBase.Songs.GetCurrentCategoryIndex() >= 0 || _PreviewSelected < 0 || _PreviewSelected >= CBase.Songs.GetNumCategories())
if (CBase.Songs.IsInCategory() || _PreviewSelected < 0 || _PreviewSelected >= CBase.Songs.GetNumCategories())
return false;
_EnterCategory(_PreviewSelected);
return true;
@@ -582,7 +582,7 @@ namespace VocaluxeLib.Menu.SongMenu
if (!_Initialized)
return;
if (CBase.Songs.GetCurrentCategoryIndex() == -1)
if (!CBase.Songs.IsInCategory())
return;
_Reset();
@@ -596,7 +596,7 @@ namespace VocaluxeLib.Menu.SongMenu
protected void _SelectSong(int nr)
{
if (CBase.Songs.GetCurrentCategoryIndex() >= 0 && (CBase.Songs.GetNumSongsVisible() > 0) && (nr >= 0) && ((_Actsong != nr) || (_Streams.Count == 0)))
if (CBase.Songs.IsInCategory() && (CBase.Songs.GetNumSongsVisible() > 0) && (nr >= 0) && ((_Actsong != nr) || (_Streams.Count == 0)))
{
_Streams.ForEach(soundStream => CBase.Sound.FadeAndStop(soundStream, 0f, 1f));
_Streams.Clear();