fixed frodo exception in resume dialog
Merge branch 'master' into 2.5.0