Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/bugfix-0.1.1'

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-04-09 11:12:45 +02:00
2 parents 9d72369a92 96dc37e788
commit 41933045aa
2 files changed
+3 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CSettings.cs
+2 -2
View File
@@ -44,10 +44,10 @@ namespace Vocaluxe.Base
public const int iVersionMajor = 0; public const int iVersionMajor = 0;
public const int iVersionMinor = 1; // milestones public const int iVersionMinor = 1; // milestones
public const int iVersionSub = 0; // steps public const int iVersionSub = 1; // steps
public const ERevision VersionRevision = ERevision.Release; public const ERevision VersionRevision = ERevision.Release;
public const int iBuild = 60; // Increase on every published version! Never Reset! public const int iBuild = 61; // Increase on every published version! Never Reset!
public const int iDatabaseHighscoreVersion = 1; public const int iDatabaseHighscoreVersion = 1;
public const int iDatabaseCoverVersion = 1; public const int iDatabaseCoverVersion = 1;
Vocaluxe/Screens/CScreenLoad.cs
+1 -6
View File
@@ -150,12 +150,7 @@ namespace Vocaluxe.Screens
if (CSettings.GameState == EGameState.EditTheme) if (CSettings.GameState == EGameState.EditTheme)
_timer.Stop(); _timer.Stop();
else else
_timer.Start(); _timer.Start();
if (CSongs.SongsLoaded && CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && _timer.ElapsedMilliseconds > 1000L)
{
CSongs.LoadCover(0L, 1);
}
bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) || bool next = ((CConfig.CoverLoading == ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART && CSongs.CoverLoaded) ||
CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART); CConfig.CoverLoading != ECoverLoading.TR_CONFIG_COVERLOADING_ATSTART);