[svn-commits] trunk - r7338 in /trunk: ./ apps/app_queue.c

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Dec  4 18:11:00 2005
New Revision: 7338

URL: http://svn.digium.com/view/asterisk?rev=7338&view=rev
Log:
Merged revisions 7337 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7337 | russell | 2005-12-04 19:09:12 -0500 (Sun, 04 Dec 2005) | 2 lines

don't delete dynamic queue members when reloading the static members from a realtime database (issue #5922)

........

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

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Dec  4 18:11:00 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7335
+/branches/1.2:1-7337

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=7338&r1=7337&r2=7338&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Sun Dec  4 18:11:00 2005
@@ -850,10 +850,11 @@
 		v = v->next;
 	}
 
-	/* Temporarily set members dead so we can detect deleted ones. */
+	/* Temporarily set non-dynamic members dead so we can detect deleted ones. */
 	m = q->members;
 	while (m) {
-		m->dead = 1;
+		if (!m->dynamic)
+			m->dead = 1;
 		m = m->next;
 	}