Fix for #315, backport xbmc always on option

fix deleted line