[asterisk-commits] bweschke: trunk r43865 - in /trunk: ./ apps/app_queue.c

[asterisk-commits at lists.digium.com]

Author: bweschke
Date: Thu Sep 28 08:35:04 2006
New Revision: 43865

URL: http://svn.digium.com/view/asterisk?rev=43865&view=rev
Log:
Merged revisions 43864 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43864 | bweschke | 2006-09-28 09:24:10 -0400 (Thu, 28 Sep 2006) | 3 lines

 Autopause not working for queue members. (#8042 - jmls reported and patch)


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Sep 28 08:35:04 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524,43553,43564,43616,43635-43702,43704-43755,43757-43800,43802-43846,43852,43861-43862
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524,43553,43564,43616,43635-43702,43704-43755,43757-43800,43802-43846,43852,43861-43862,43864

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=43865&r1=43864&r2=43865&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Sep 28 08:35:04 2006
@@ -1887,9 +1887,11 @@
 					peer = o;
 				}
 			} else if (o->chan && (o->chan == winner)) {
+
+				ast_copy_string(on, o->member->interface, sizeof(on));
+				ast_copy_string(membername, o->member->membername, sizeof(membername));
+
 				if (!ast_strlen_zero(o->chan->call_forward) && !forwardsallowed) {
-					ast_copy_string(on, o->member->interface, sizeof(on));
-					ast_copy_string(membername, o->member->membername, sizeof(membername));
 					if (option_verbose > 2)
 						ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s' prevented.\n", in->name, o->chan->call_forward);
                                         winner = o->chan = NULL;