[osx] reset to window before switching resolutions when already fullscreen. fixes bad window on return
Merge pull request #3311 from jmarshallnz/fullscreen_switching_fixes

Fullscreen switching fixes