[svn-commits] jpeeler: branch 1.8 r307228 - in /branches/1.8: ./ main/features.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Wed Feb  9 13:52:51 2011
New Revision: 307228

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307228
Log:
Merged revisions 307227 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r307227 | jpeeler | 2011-02-09 13:52:12 -0600 (Wed, 09 Feb 2011) | 11 lines
  
  Make sure to set parking dial context for non-default parking lots.
  
  Since parking_con_dial isn't settable, set all parking lots to "park-dial".
  
  (closes issue #17946)
  Reported by: bluecrow76
  Patches:
        asterisk-1.8.0-beta4-multipark-fixes-2010SEP02.diff uploaded by bluecrow76 (license 270)
        modified by me
........

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

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/features.c?view=diff&rev=307228&r1=307227&r2=307228
==============================================================================
--- branches/1.8/main/features.c (original)
+++ branches/1.8/main/features.c Wed Feb  9 13:52:51 2011
@@ -4698,9 +4698,9 @@
 
 	if (!var) {	/* Default parking lot */
 		ast_copy_string(parkinglot->parking_con, "parkedcalls", sizeof(parkinglot->parking_con));
-		ast_copy_string(parkinglot->parking_con_dial, "park-dial", sizeof(parkinglot->parking_con_dial));
 		ast_copy_string(parkinglot->mohclass, "default", sizeof(parkinglot->mohclass));
 	}
+	ast_copy_string(parkinglot->parking_con_dial, "park-dial", sizeof(parkinglot->parking_con_dial));
 
 	/* Check for errors */
 	if (ast_strlen_zero(parkinglot->parking_con)) {