Options Dialog: save right after pressing Apply

Fixes #2242, #2373