B the war was over :did he return
要倒装是主句倒装【did he return】,而不是从句.when the war was over 是时间状语从句“当战争结束时”