* Added more load_floorlist() commands to the beginning and end of functions

  in the client that manipulate the floor list.  This fixes a bug in which
  new floors don't show up right away after being created.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 877da9239333867f5e337b98e8de787db112031f..1dcc7c64f392869db6a97ab043e551db83e1f33d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,9 @@
  $Log$
+ Revision 590.12  2001/12/18 05:54:16  ajc
+ * Added more load_floorlist() commands to the beginning and end of functions
+   in the client that manipulate the floor list.  This fixes a bug in which
+   new floors don't show up right away after being created.
+
  Revision 590.11  2001/12/17 08:14:26  nbryant
  restored the checks for /usr/include/db3 and /usr/local/include/db3
  in configure.  there are too many variations on db installation; this is
@@ -2980,3 +2985,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/rooms.c b/citadel/rooms.c
index 5fc56c3c636e7d5fac2d32b2c378998ad1dda856..78d75041da9c11fdf3fe9810333165b54672941a 100644 (file)
--- a/citadel/rooms.c
+++ b/citadel/rooms.c
@@ -1123,6 +1123,8 @@ void create_floor(void)
        char buf[SIZ];
        char newfloorname[SIZ];
 
+       load_floorlist();
+
        serv_puts("CFLR xx|0");
        serv_gets(buf);
        if (buf[0] != '2') {
@@ -1139,6 +1141,8 @@ void create_floor(void)
        } else {
                printf("%s\n", &buf[4]);
        }
+
+       load_floorlist();
 }
 
 /*
@@ -1150,8 +1154,7 @@ void edit_floor(void)
        int expire_mode = 0;
        int expire_value = 0;
 
-       if (floorlist[(int) curr_floor][0] == 0)
-               load_floorlist();
+       load_floorlist();
 
        /* Fetch the expire policy (this will silently fail on old servers,
         * resulting in "default" policy)
@@ -1220,8 +1223,7 @@ void kill_floor(void)
        int floornum_to_delete, a;
        char buf[SIZ];
 
-       if (floorlist[(int) curr_floor][0] == 0)
-               load_floorlist();
+       load_floorlist();
        do {
                floornum_to_delete = (-1);
                printf("(Press return to abort)\n");
@@ -1242,4 +1244,5 @@ void kill_floor(void)
        serv_puts(buf);
        serv_gets(buf);
        printf("%s\n", &buf[4]);
+       load_floorlist();
 }