move delete and save outside of conditional
Merge branch 'master' of github.com:avalonmediasystem/avalon