Merged revisions 192861 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r192861 | jpeeler | 2009-05-06 17:17:27 -0500 (Wed, 06 May 2009) | 17 lines
  
  Merged revisions 192858 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r192858 | jpeeler | 2009-05-06 17:15:19 -0500 (Wed, 06 May 2009) | 10 lines
    
    Make ParkedCall application stop execution of the dialplan after hang up
    
    Just changed park_exec to always return non-zero. I really wasn't entirely sure
    at first if this was a bug. Decided it was since it would be surprising when 
    not using ParkedCall in the dialplan to hang up and have dialplan execution
    continue.
    
    (closes issue #14555)
    Reported by: francesco_r
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192865 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-05-06 22:18:30 +00:00
parent 4600d1a538
commit 76c66014b8

View File

@@ -3070,7 +3070,7 @@ static int park_exec(struct ast_channel *chan, void *data)
/* Simulate the PBX hanging up */ /* Simulate the PBX hanging up */
ast_hangup(peer); ast_hangup(peer);
return res; return -1;
} else { } else {
/*! \todo XXX Play a message XXX */ /*! \todo XXX Play a message XXX */
if (ast_stream_and_wait(chan, "pbx-invalidpark", "")) if (ast_stream_and_wait(chan, "pbx-invalidpark", ""))
@@ -3079,7 +3079,7 @@ static int park_exec(struct ast_channel *chan, void *data)
res = -1; res = -1;
} }
return res; return -1;
} }
/*! /*!