Solved merging conflict of EXP-Windows-7-Half-Full-Screen to master (…

…GUISettings.cs was still listing GUIToggleButton)

mediaportal/WindowPlugins/GUISettings/GUISettings.cs

@@ -46,7 +46,7 @@ public sealed class GUISettings : GUIInternalWindow, ISetupForm, IShowPlugin
   {
     [SkinControl(11)] private readonly GUIButtonControl _btnMiniDisplay = null;
     [SkinControl(10)] private readonly GUIButtonControl _btnTV = null;
-    [SkinControl(20)] private readonly GUIToggleButtonControl _btnLocked = null;
+    [SkinControl(20)] private readonly GUICheckButton _btnLocked = null;
 
     [DllImport("shlwapi.dll")]
     private static extern bool PathIsNetworkPath(string path);