fixed resume generation loop while displaying the dialog
Merge remote-tracking branch 'origin/devel' into devel