fixed racecondition with EngineControl::getCurrentSample()
Merge branch 'master' into recording_improvements