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