[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    icecream/daemon
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-09-11 12:05:20
Message-ID: 1157976320.915837.18882.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 583108 by mueller:

merge the easy valgrind error


 M  +9 -9      main.cpp  


--- trunk/icecream/daemon/main.cpp #583107:583108
@@ -1204,6 +1204,14 @@
                 MsgChannel *c = it->second;
                 Client* client = clients.find_by_channel(c);
                 ++it;
+                if (client->status == Client::WAITFORCHILD
+                    && client->pipe_to_child != -1
+                    && FD_ISSET(client->pipe_to_child, &listen_set) )
+                {
+                    max_fd--;
+                    if (!handle_compile_done(client))
+                        return 1;
+                }
                 if (FD_ISSET (i, &listen_set)) {
                     c->read_a_bit();
                     while (c->has_msg()) {
@@ -1216,15 +1224,7 @@
                     }
                     max_fd--;
                 }
-                if (client->status == Client::WAITFORCHILD
-                    && client->pipe_to_child != -1
-                    && FD_ISSET(client->pipe_to_child, &listen_set) )
-                {
-                    max_fd--;
-                    if (!handle_compile_done(client))
-                        return 1;
-                }
-            }
+           }
         }
     }
     return 0;
[prev in list] [next in list] [prev in thread] [next in thread]