[asterisk-commits] jpeeler: branch 1.6.1 r175190 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb 12 12:01:54 2009
New Revision: 175190

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=175190
Log:
Merged revisions 175188 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r175188 | jpeeler | 2009-02-12 12:00:11 -0600 (Thu, 12 Feb 2009) | 12 lines
  
  Merged revisions 175187 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r175187 | jpeeler | 2009-02-12 11:57:10 -0600 (Thu, 12 Feb 2009) | 6 lines
    
    Fix crash in event of failed attempt to transfer to parking
    
    The peer is not going to exist during a transfer, so don't try to play a sound
    to it.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=175190&r1=175189&r2=175190
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Thu Feb 12 12:01:54 2009
@@ -756,7 +756,8 @@
 	}
 
 	if ((args->pu = park_space_reserve(rchan, peer, args)) == NULL) {
-		ast_stream_and_wait(peer, "beeperr", "");
+		if (peer)
+			ast_stream_and_wait(peer, "beeperr", "");
 		return AST_FEATURE_RETURN_PARKFAILED;
 	}