Index: common/item.c
===================================================================
RCS file: /cvsroot/crossfire/client/common/item.c,v
retrieving revision 1.16
diff -C5 -r1.16 item.c
*** common/item.c       14 Mar 2006 18:08:45 -0000      1.16
--- common/item.c       1 May 2006 22:22:46 -0000
***************
*** 336,346 ****
      }
      if (op->next) {
        op->next->prev = op->prev;
      }

!     if (cpl.container == op) return;  /* Don't free this! */

      /* add object to a list of free objects */
      op->next = free_items;
      if (op->next != NULL)
        op->next->prev = op;
--- 336,347 ----
      }
      if (op->next) {
        op->next->prev = op->prev;
      }

!     /* if the container is removed, we have no currently active container */
!     if (cpl.container == op) cpl.container=NULL;

      /* add object to a list of free objects */
      op->next = free_items;
      if (op->next != NULL)
        op->next->prev = op;