Merge branch 'develop' into patch-4
This commit is contained in:
2 files changed
+3
-2
No files matched your search
@@ -427,6 +427,7 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
_ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
|
_ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs();
|
||||||
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
|
_ScreenSongOptions.Sorting.FilterPlaylistID = -1;
|
||||||
|
|
||||||
|
_ScreenSongOptions.Selection.SongIndex = -1;
|
||||||
_ScreenSongOptions.Selection.CategoryIndex = -1;
|
_ScreenSongOptions.Selection.CategoryIndex = -1;
|
||||||
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
|
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
|
||||||
break;
|
break;
|
||||||
@@ -718,4 +719,4 @@ namespace VocaluxeLib.PartyModes.Challenge
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+1
-1
@@ -9,7 +9,7 @@ platform:
|
|||||||
clone_depth: 15
|
clone_depth: 15
|
||||||
environment:
|
environment:
|
||||||
GitHubKey:
|
GitHubKey:
|
||||||
secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
|
secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
|
||||||
init:
|
init:
|
||||||
- git config --global core.autocrlf true
|
- git config --global core.autocrlf true
|
||||||
install:
|
install:
|
||||||
|
|||||||
Reference in new issue
Block a user