Fix some vblank callback wait problems.

Stupid mistake, missing this.  May help #3680.