one more instance of stream_and_wait, and remove an extra

'error = 1' line put in by miustake



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20693 65c4cc65-6c06-0410-ace0-fbb531ad65f3