Merge pull request #4664 from Montellese/broken_checks

fix broken comparisons
Conflicts:
	xbmc/settings/windows/GUIControlSettings.cpp