--- a/src/irc_net.c	Thu Apr 23 17:17:14 2009 +0300
+++ b/src/irc_net.c	Thu Apr 23 17:17:33 2009 +0300
@@ -344,7 +344,7 @@
 void irc_net_destroy (struct irc_net *net)
 {
     struct irc_chan *chan_next = TAILQ_FIRST(&net->channels), *chan;
-    struct irc_user *user_next = LIST_FIRST(&net->users), *user;
+    struct irc_user *user_next, *user;
 
     // our conn
     if (net->conn)
@@ -359,7 +359,7 @@
 
     // our users
     // XXX: this disregards external refs
-    while ((user = user_next)) {
+    for (user_next = LIST_FIRST(&net->users); (user = user_next); ) {
         user_next = LIST_NEXT(user, net_users);
 
         irc_user_destroy(user);