[zaptel-commits] trunk r1070 - in /trunk: ./ wctdm.c

[zaptel-commits at lists.digium.com]

Author: file
Date: Wed May 17 16:14:31 2006
New Revision: 1070

URL: http://svn.digium.com/view/zaptel?rev=1070&view=rev
Log:
Merged revisions 1069 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1069 | file | 2006-05-17 18:13:27 -0300 (Wed, 17 May 2006) | 2 lines

Don't change the value of lasttxhook, instead do a comparison. (issue #7175 reported and fixed by Thomas Andrews) If this breaks things, you can yell at me.

........

Modified:
    trunk/   (props changed)
    trunk/wctdm.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Wed May 17 16:14:31 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069

Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?rev=1070&r1=1069&r2=1070&view=diff
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Wed May 17 16:14:31 2006
@@ -1084,7 +1084,7 @@
 							wc->mod[x].fxs.idletxhookstate = 0x5;	/* Switch to active */
 						else
 							wc->mod[x].fxs.idletxhookstate = 0x1;
-						if ((wc->mod[x].fxs.lasttxhook == 0x2) || (wc->mod[x].fxs.lasttxhook = 0x6)) {
+						if ((wc->mod[x].fxs.lasttxhook == 0x2) || (wc->mod[x].fxs.lasttxhook == 0x6)) {
 							/* Apply the change if appropriate */
 							if (reversepolarity) 
 								wc->mod[x].fxs.lasttxhook = 0x5;