[asterisk-commits] file: trunk r71525 - in /trunk: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jun 25 08:04:36 2007
New Revision: 71525

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

........
r71522 | file | 2007-06-25 09:03:03 -0400 (Mon, 25 Jun 2007) | 2 lines

Minor tweak for queueing up the unhold frame... this will teach me to do bugs while half asleep. (issue #10046 reported by dimas)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_agent.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=71525&r1=71524&r2=71525
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Mon Jun 25 08:04:36 2007
@@ -959,7 +959,8 @@
 			ast_mutex_unlock(&p->lock);     /* For other thread to read the condition. */
 			return NULL;
 		}	
-	} else if (p->chan)
+	} 
+	if (p->chan)
 		ast_indicate(p->chan, AST_CONTROL_UNHOLD);
 	p->owning_app = pthread_self();
 	/* After the above step, there should not be any blockers. */