1 files changed, 13 insertions, 4 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index fb0928bd..d117cbd2 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -516,10 +516,19 @@ gnunet_gtk_select (void *cls,
 #endif
 
   g_main_context_prepare (ml->gmc, &ml->max_priority);
-  while (ml->cached_poll_array_size < (need_gfds = g_main_context_query (ml->gmc,
-      ml->max_priority, &delay, &ml->cached_poll_array[fd_counter], ml->cached_poll_array_size - fd_counter)))
-    resize_cached_poll_array (ml,
-                              ml->cached_poll_array_size - fd_counter + need_gfds);
+  need_gfds = GUINT_MAX;
+  while (1)
+    {
+      need_gfds = g_main_context_query (ml->gmc,
+                                        ml->max_priority,
+                                        &delay,
+                                        &ml->cached_poll_array[fd_counter], 
+                                        ml->cached_poll_array_size - fd_counter);
+      if (ml->cached_poll_array_size < need_gfds + fd_counter)
+        break;
+      resize_cached_poll_array (ml,
+                                fd_counter + need_gfds);
+    }
 
   ml->poll_array_active = fd_counter + need_gfds;