Flesh out remaining "rrmemory" logic

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3001 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 8f4689e..fe3373b 100755 (executable)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -599,8 +599,15 @@ static int store_next(struct queue_ent *qe, struct localuser *outgoing)
                qe->parent->rrpos = best->metric % 1000;
        } else {
                /* Just increment rrpos */
                qe->parent->rrpos = best->metric % 1000;
        } else {
                /* Just increment rrpos */

-               qe->parent->rrpos++;
+               if (!qe->parent->wrapped) {
+                       /* No more channels, start over */
+                       qe->parent->rrpos = 0;
+               } else {
+                       /* Prioritize next entry */
+                       qe->parent->rrpos++;
+               }

        }
        }

+       qe->parent->wrapped = 0;

        return 0;
 }
 
        return 0;
 }