diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index 0058725e..cd75ed75 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -16,7 +16,7 @@ Menu - + 40 40 @@ -526,4 +526,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index f7e99edf..f5696725 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -16,7 +16,7 @@ Menu - + 40 40 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index 8d43038f..b5740cc5 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -16,7 +16,7 @@ Menu - + 40 40 @@ -504,4 +504,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index 1b052f4a..ca84426b 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -16,7 +16,7 @@ Menu - + 40 40 @@ -691,4 +691,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index aee9420a..ed9bcb15 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -78,7 +78,7 @@ TimeLine - 44 + 50 702 1090 10 @@ -89,7 +89,7 @@ TimeLine - 44 + 50 696 1090 9 @@ -100,7 +100,7 @@ TimeLine - 44 + 50 696 1090 9 @@ -1900,4 +1900,4 @@ - \ No newline at end of file + diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 765ccb93..24584cd1 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -894,6 +894,10 @@ namespace Vocaluxe.Screens _Statics[_StaticLyricsDuet].Alpha = 0f; _Statics[_StaticLyricHelperDuet].Alpha = 0f; + + _Statics[_StaticTimeLine].Visible = CConfig.Config.Theme.TimerLook == ETimerLook.TR_CONFIG_TIMERLOOK_NORMAL; + _Statics[_StaticTimeLineExpandedHighlighted].Visible = false; + _Statics[_StaticTimeLineExpandedNormal].Visible = false; } private void _UpdateMedleyCountdown() diff --git a/VocaluxeLib/Profile/CProfile.cs b/VocaluxeLib/Profile/CProfile.cs index a0ee3ee4..2e168b97 100644 --- a/VocaluxeLib/Profile/CProfile.cs +++ b/VocaluxeLib/Profile/CProfile.cs @@ -139,8 +139,7 @@ namespace VocaluxeLib.Profile if (filename == "") filename = "1"; - FilePath = Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()); - FilePath = Path.Combine(FilePath, CHelper.GetUniqueFileName(FilePath, filename + ".xml", false)); + FilePath = CHelper.GetUniqueFileName(Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()), filename + ".xml"); } var xml = new CXmlSerializer();