Fixes #5779 with new PSPScreenShotDiag class

Fixes #5779