Both the variants are indeed possible. There still exists people who say that "Till (until) when...." is more correct than "When...till (until)...". It has something to do with trying to avoid ending a phrase or sentence with a preposition. I disagree. In written, formal English, you would be safe with the first, just in case one of those people is reading your text. However, in cases of spoken English, nobody would notice the difference.