Was it not until he came back ________ you leave?

A.when

B.that

C.after

D.before

答案及解析： B