What if Diana didn't die in that accident?

Her and Charle's never divorced making the marriage to Camilla void.

If something happened to Charles, say he abdicates, and Diana reappears, would she not be the Queen?