[svn-commits] oej: branch group/multiparking r104056 - /team/group/multiparking/main/

[SVN commits to the Digium repositories]

Author: oej
Date: Sat Feb 23 10:41:50 2008
New Revision: 104056

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104056
Log:
Fix mohclass

Modified:
    team/group/multiparking/main/features.c

Modified: team/group/multiparking/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/main/features.c?view=diff&rev=104056&r1=104055&r2=104056
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Sat Feb 23 10:41:50 2008
@@ -516,8 +516,8 @@
 	/* Put the parked channel on hold if we have two different channels */
 	if (chan != peer) {
 		ast_indicate_data(pu->chan, AST_CONTROL_HOLD, 
-			S_OR(parkmohclass, NULL),
-			!ast_strlen_zero(parkmohclass) ? strlen(parkmohclass) + 1 : 0);
+			S_OR(parkinglot->mohclass, NULL),
+			!ast_strlen_zero(parkinglot->mohclass) ? strlen(parkinglot->mohclass) + 1 : 0);
 	}
 	
 	pu->start = ast_tvnow();
@@ -588,8 +588,8 @@
 	if (pu->notquiteyet) {
 		/* Wake up parking thread if we're really done */
 		ast_indicate_data(pu->chan, AST_CONTROL_HOLD, 
-			S_OR(parkmohclass, NULL),
-			!ast_strlen_zero(parkmohclass) ? strlen(parkmohclass) + 1 : 0);
+			S_OR(parkinglot->mohclass, NULL),
+			!ast_strlen_zero(parkinglot->mohclass) ? strlen(parkinglot->mohclass) + 1 : 0);
 		pu->notquiteyet = 0;
 		pthread_kill(parking_thread, SIGURG);
 	}
@@ -2400,8 +2400,8 @@
 					if (pu->moh_trys < 3 && !chan->generatordata) {
 						ast_debug(1, "MOH on parked call stopped by outside source.  Restarting on channel %s.\n", chan->name);
 						ast_indicate_data(chan, AST_CONTROL_HOLD, 
-							S_OR(parkmohclass, NULL),
-							!ast_strlen_zero(parkmohclass) ? strlen(parkmohclass) + 1 : 0);
+							S_ORcurlot->mohclass, NULL),
+							!ast_strlen_zero(curlot->mohclass) ? strlen(curlot->mohclass) + 1 : 0);
 						pu->moh_trys++;
 					}
 					goto std;	/* XXX Ick: jumping into an else statement??? XXX */