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

List:       kde-commits
Subject:    branches/work/icecream-make-it-cool/daemon
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-07-10 18:39:57
Message-ID: 1152556797.032900.4693.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 560597 by mueller:

more trunk merges


 M  +2 -6      main.cpp  


--- branches/work/icecream-make-it-cool/daemon/main.cpp #560596:560597
@@ -1041,7 +1041,7 @@
            messages queue up, we can't handle them right now
            anyway, and we don't want to end the client because
            of a protocol error. */
-        return false;
+        return true;
     }
 
     Msg *msg = c->get_msg();
@@ -1097,14 +1097,10 @@
          it != fd2chan.end();) {
         int i = it->first;
         MsgChannel *c = it->second;
-        bool ok = true;
         ++it;
         /* handle_activity() can delete c and make the iterator
            invalid.  */
-        while (ok && c->has_msg ())
-            if (!handle_activity (c))
-                ok = false;
-        if (ok)  {
+        if (!c->has_msg() || handle_activity(c)) {
             if (i > max_fd)
                 max_fd = i;
             FD_SET (i, &listen_set);
[prev in list] [next in list] [prev in thread] [next in thread]