Screensaver repair

Single picture as screensaver was not displayed anymore after the last update
minor code optimizing
Merge pull request #871 from WS64/master

Screensaver repair