[Spice-devel] [PATCH 07/15] dc: dpi is always a value computed from dpi_ring_item

[Frediano Ziglio]

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 server/display-channel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/display-channel.c b/server/display-channel.c
index 27d8e83..d618ba5 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -509,13 +509,13 @@ static int current_add_equal(DisplayChannel *display, DrawItem *item, TreeItem *
             dpi_ring_item = ring_get_head(&other_drawable->pipes);
             /* dpi contains a sublist of dcc's, ordered the same */
             while (worker_ring_item) {
-                dpi = SPICE_CONTAINEROF(dpi_ring_item, RedDrawablePipeItem, base);
                 for (;;) {
                     if (!worker_ring_item) {
                         goto out_loop;
                     }
                     dcc = SPICE_CONTAINEROF(worker_ring_item, DisplayChannelClient,
                                             common.base.channel_link);
+                    dpi = SPICE_CONTAINEROF(dpi_ring_item, RedDrawablePipeItem, base);
                     if (dpi && dcc == dpi->dcc) {
                         if (dpi_ring_item) {
                             dpi_ring_item = ring_next(&other_drawable->pipes, dpi_ring_item);
-- 
2.7.4