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

List:       kde-commits
Subject:    icecream/daemon
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-09-11 7:36:28
Message-ID: 1157960188.908960.21556.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 582972 by coolo:

don't erase from the map - or my assert will hit too often


 M  +2 -3      main.cpp  


--- trunk/icecream/daemon/main.cpp #582971:582972
@@ -228,13 +228,12 @@
         return 0;
     }
 
-    Client *take_first()
+    Client *first()
     {
         iterator it = begin();
         if ( it == end() )
             return 0;
         Client *cl = it->second;
-        erase( it );
         return cl;
     }
 
@@ -968,7 +967,7 @@
 void Daemon::clear_children()
 {
     while ( !clients.empty() ) {
-        Client *cl = clients.take_first();
+        Client *cl = clients.first();
         handle_end( cl, 116 );
     }
 
[prev in list] [next in list] [prev in thread] [next in thread]