It wasn’t until dark _________ he found _________ he thought was the correct way to solve the problem.

A．when , that

B．that , that

C．when , what

D．that , what