It was not until dark _____he found _____he thought was the correct way to solve the problem.

A．that; what

B．that ; that

C．when; that

D．when ;what