Added fixes for Mantis 4252 (MP hangs at end of recording when skipping to end)