Merge pull request #3095 from void-ghost/savestate_race_condition_fix SaveState: Fix for race condition in SaveAs(...)