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; what

D．when; that