Move the m_guideDataOnly check to occur at the top of handleChannels().
(cherry picked from commit 7c15b1a607c99819fa973332cede130d292344f2)
Fix operator error in [cd14631c3]
(cherry picked from commit 0802c437633fcbe279d9b20a37ff8b54265e103d)