Trigger a video exit when closing the buffering screen.
Cleaned up the streaming code a bit.