ChannelSelection: Corrigate selected service is already played

And simplify that code a bit

Thanks for all the reporting and help Dima73