ComboBox: Fix index out of bounds bug introduced in previous commit
ComboBox: Fix index out of bounds bug introduced in previous commit

Skarm/walk,JSchwehn/walk,hawkchch/walk,Skarm/walk,dayed/walk,jtwatson/walk,CodyGuo/walk,tajtiattila/walk,henrylee2cn/walk