Agreed. There are ambiguities if you don't have much context.
1. John got on the plane that would take him to into battle. She cried when he left. (meaning: he had left)
2. John announced he was moving out of their apartment to live separately. She cried when he was leaving. (Since the packing and conversation would take a while, it likely took place during and after his leaving.)