What if you start/resume playing the same video file? The subtitle search would then automatically overwrite your previously hand-picked subtitles.
I think the m_autoDownloaded flag should be initialized upon starting a video, based on the existence of the subtitle file that would be written by auto-download. Isn't that how it used to work in Frodo?