[svn-commits] qwell: branch 1.4 r182652 - in /branches/1.4: apps/ channels/

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Mar 17 15:13:40 2009
New Revision: 182652

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182652
Log:
Allow dahdichanname to work as advertised.

(closes issue #14056)
Reported by: dsedivec
Patches:
      load_from_zapata_conf.patch uploaded by dsedivec (license 638)

Modified:
    branches/1.4/apps/app_flash.c
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/apps/app_flash.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/apps/app_flash.c?view=diff&rev=182652&r1=182651&r2=182652
==============================================================================
--- branches/1.4/apps/app_flash.c (original)
+++ branches/1.4/apps/app_flash.c Tue Mar 17 15:13:40 2009
@@ -126,7 +126,7 @@
 
 static int load_module(void)
 {
-	if (dahdi_chan_mode == CHAN_ZAP_MODE) {
+	if (*dahdi_chan_mode == CHAN_ZAP_MODE) {
 		return ast_register_application(app, flash_exec, zap_synopsis, zap_descrip);
 	} else {
 		return ast_register_application(app, flash_exec, dahdi_synopsis, dahdi_descrip);

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=182652&r1=182651&r2=182652
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Tue Mar 17 15:13:40 2009
@@ -11997,7 +11997,7 @@
 #ifdef HAVE_ZAPTEL
 	int load_from_zapata_conf = 1;
 #else
-	int load_from_zapata_conf = (dahdi_chan_mode == CHAN_ZAP_MODE);
+	int load_from_zapata_conf = (*dahdi_chan_mode == CHAN_ZAP_MODE);
 #endif
 
 	if (load_from_zapata_conf) {