The correct option is A when
'When' is used to introduce a single completed event that takes place in the middle of a longer activity or event. Here the same is indicated. Therefore, the correct option is: when. We cannot use 'if' since it is certain that the person will be in London, evident from the sentence 'You will be in London again'.