* Repaired an incorrect adjustment of floor reference counts when a room was

  moved to a different floor.  (Thanks to Winzlo for reporting this.)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 4e31b11533647daafcfe905a46ef56306c486038..07159e8a92ce53eab8821007feeff679312f923d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 610.7  2003/09/02 15:05:34  ajc
+ * Repaired an incorrect adjustment of floor reference counts when a room was
+   moved to a different floor.  (Thanks to Winzlo for reporting this.)
+
  Revision 610.6  2003/09/02 14:49:05  ajc
  * Improve client chat mode reliability and performance by assuming that all
    server output will be in complete lines.  (This is a safe assumption.)
@@ -4990,3 +4994,4 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
+

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index efb410502fedf46967d684ebf2a13abe20b7273f..69b8a77c9906cc7001b83f1c4d2610d73a2110cc 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -1193,9 +1193,11 @@ int CtdlRenameRoom(char *old_name, char *new_name, int new_floor) {
                lgetfloor(&flbuf, old_floor);
                --flbuf.f_ref_count;
                lputfloor(&flbuf, old_floor);
-               lgetfloor(&flbuf, CC->room.QRfloor);
+               lprintf(9, "Reference count for floor %d is now %d\n", old_floor, flbuf.f_ref_count);
+               lgetfloor(&flbuf, new_floor);
                ++flbuf.f_ref_count;
-               lputfloor(&flbuf, CC->room.QRfloor);
+               lputfloor(&flbuf, new_floor);
+               lprintf(9, "Reference count for floor %d is now %d\n", new_floor, flbuf.f_ref_count);
        }
 
        /* ...and everybody say "YATTA!" */