[srvx-commits] CVS: services/src chanserv.c,1.302,1.303

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv4663/src

Modified Files:
	chanserv.c 
Log Message:
set channel->channel->channel_info to NULL even when unregging a
  no-longer-suspended channel


Index: chanserv.c
===================================================================
RCS file: /cvsroot/srvx/services/src/chanserv.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -C2 -r1.302 -r1.303
*** chanserv.c	31 Oct 2002 03:38:01 -0000	1.302
--- chanserv.c	9 Nov 2002 01:30:45 -0000	1.303
***************
*** 1411,1423 ****
  	}
      }
-     else
-     {
- 	channel->channel->channel_info = NULL;
-     }
  
!     if(channel->notes)
!     {
!         dict_delete(channel->notes);
!     }
  
      free(channel);
--- 1411,1418 ----
  	}
      }
  
!     if(channel->channel) channel->channel->channel_info = NULL;
! 
!     if(channel->notes) dict_delete(channel->notes);
  
      free(channel);
***************
*** 6185,6193 ****
  {
      struct chanData *cData;
!     struct userData *uData = NULL;
      struct handle_info *handle;
  
-     if(!channel->channel_info || IsSuspended(channel->channel_info) || IsLocal(user)) return;
      cData = channel->channel_info;
  
      if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && !channel->join_flooded)
--- 6180,6188 ----
  {
      struct chanData *cData;
!     struct userData *uData;
      struct handle_info *handle;
  
      cData = channel->channel_info;
+     if(!cData || IsSuspended(cData) || IsLocal(user)) return;
  
      if((cData->flags & CHANNEL_DYNAMIC_LIMIT) && !channel->join_flooded)