Add a semaphore to auto-save to make sure save is not in progress when Stop returns