Merge pull request #7437 from stenzek/graphics-options-race Fix race condition caused by opening graphics options while running
