It was not until dark ___ he was aware of ___ he thought was the correct way to solve the problem.

A．when; what

B．that; that

C．that; what

D．when; that