4. 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