Revert "fixed, compiler warning. Let us try to keep assignments out of if statments"

This reverts commit 40e06e7140b561aa38d6642a19b0fde44ea1ab61.
Merge remote-tracking branch 'xbmc/master' into newclock