diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs index af0ec07e..bbb9ce05 100644 --- a/Vocaluxe/Base/CGraphics.cs +++ b/Vocaluxe/Base/CGraphics.cs @@ -268,12 +268,12 @@ namespace Vocaluxe.Base ReloadCursor(); for (int i = 0; i < _Screens.Count; i++) { - _Screens[i].ReloadTheme(); + _Screens[i].ReloadTheme(CTheme.GetThemeScreensPath(-1)); } for (int i = 0; i < _PopupScreens.Count; i++) { - _PopupScreens[i].ReloadTheme(); + _PopupScreens[i].ReloadTheme(CTheme.GetThemeScreensPath(-1)); } } diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index ed312d59..fb241f53 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -174,7 +174,7 @@ namespace Vocaluxe.Screens } - public override void ReloadTheme() { } + public override void ReloadTheme(string XmlPath) { } public override void SaveTheme() { } diff --git a/VocaluxeLib/Menu/CMenu.cs b/VocaluxeLib/Menu/CMenu.cs index 009dc463..adfbb690 100644 --- a/VocaluxeLib/Menu/CMenu.cs +++ b/VocaluxeLib/Menu/CMenu.cs @@ -663,14 +663,14 @@ namespace Vocaluxe.Menu } } - public virtual void ReloadTheme() + public virtual void ReloadTheme(string XmlPath) { if (_ThemePath == String.Empty) return; UnloadTextures(); - Init(); - LoadTheme(_ThemePath); + Init(); + LoadTheme(XmlPath); } #endregion ThemeHandler diff --git a/VocaluxeLib/Menu/IMenu.cs b/VocaluxeLib/Menu/IMenu.cs index d87ac265..6155acb1 100644 --- a/VocaluxeLib/Menu/IMenu.cs +++ b/VocaluxeLib/Menu/IMenu.cs @@ -18,7 +18,7 @@ namespace Vocaluxe.Menu void SaveTheme(); void ReloadTextures(); void UnloadTextures(); - void ReloadTheme(); + void ReloadTheme(string XmlPath); bool HandleInput(KeyEvent KeyEvent); bool HandleMouse(MouseEvent MouseEvent); diff --git a/VocaluxeLib/PartyModes/CScreenPartyDummy.cs b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs index ceefffa0..445a4c3a 100644 --- a/VocaluxeLib/PartyModes/CScreenPartyDummy.cs +++ b/VocaluxeLib/PartyModes/CScreenPartyDummy.cs @@ -39,7 +39,7 @@ namespace Vocaluxe.PartyModes AddText(Warning); } - public override void ReloadTheme() + public override void ReloadTheme(string XmlPath) { }