[uim-commit] r2694 - branches/1.0/xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-12-23 20:37:57 -0800 (Fri, 23 Dec 2005)
New Revision: 2694

Modified:
   branches/1.0/xim/main.cpp
Log:
* xim/main.cpp : Port r2693 from trunk.


Modified: branches/1.0/xim/main.cpp
===================================================================
--- branches/1.0/xim/main.cpp	2005-12-24 04:36:57 UTC (rev 2693)
+++ branches/1.0/xim/main.cpp	2005-12-24 04:37:57 UTC (rev 2694)
@@ -165,12 +165,15 @@
 	    continue;
 	}
 
-	for (it = fd_watch_stat.begin(); it != fd_watch_stat.end(); it++) {
+	it = fd_watch_stat.begin();
+	while (it != fd_watch_stat.end()) {
 	    int fd = it->first;
 	    if (FD_ISSET(fd, &rfds))
 		it->second.fn(fd, READ_OK);
 	    if (FD_ISSET(fd, &wfds))
 		it->second.fn(fd, WRITE_OK);
+	    it = fd_watch_stat.find(fd);
+	    it++;
 	}
     }
 }