Skip to content

Commit

Permalink
changed: allow logging off, even if the login screen is not enable. t…
Browse files Browse the repository at this point in the history
…his changes the meaning of 'enable login screen' to 'enable login screen on initial startup'. credit bruing (small mod my me), ticket #10708
  • Loading branch information
spiff committed Jan 8, 2011
1 parent 06a3fcf commit 4a8bb49
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions addons/skin.confluence/720p/DialogButtonMenu.xml
Expand Up @@ -122,7 +122,7 @@
<pulseonselect>no</pulseonselect>
<font>-</font>
<label>$LOCALIZE[20126] $INFO[system.profilename]</label>
<visible>System.HasLoginScreen</visible>
<visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
<visible>System.Loggedon</visible>
</control>
<control type="button" id="11">
Expand Down Expand Up @@ -230,7 +230,7 @@
<visible>ControlGroup(13).HasFocus</visible>
<include>VisibleFadeEffect</include>
<animation effect="slide" start="0,0" end="55,0" time="0" condition="System.HasLocks">Conditional</animation>
<animation effect="slide" start="0,0" end="55,0" time="0" condition="System.HasLoginScreen + System.LoggedOn">Conditional</animation>
<animation effect="slide" start="0,0" end="55,0" time="0" condition="[System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)] + System.LoggedOn">Conditional</animation>
<control type="image">
<description>Shutdown Arrow Up image</description>
<posx>0</posx>
Expand Down
2 changes: 1 addition & 1 deletion xbmc/utils/Builtins.cpp
Expand Up @@ -1074,7 +1074,7 @@ int CBuiltins::Execute(const CStdString& execString)
}
else if (execute.Equals("system.logoff"))
{
if (g_windowManager.GetActiveWindow() == WINDOW_LOGIN_SCREEN || !g_settings.UsingLoginScreen())
if (g_windowManager.GetActiveWindow() == WINDOW_LOGIN_SCREEN)
return -1;

g_application.StopPlaying();
Expand Down

0 comments on commit 4a8bb49

Please sign in to comment.