Update of pull request #1125 with feedback from Clobber.
https://github.com/OpenEmu/OpenEmu/pull/1125