- fix announce crash bugs (reason: entering a_menu may have different board

than currbid/currboard.)


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3754 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

2 files changed, 3 insertions, 9 deletions

diff --git a/include/proto.h b/include/proto.h
index f7a4467d..d7d353db 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -40,7 +40,7 @@ int make_symbolic_link_interactively(int gid);
 void merge_dir(const char *dir1, const char *dir2, int isoutter);
 
 /* announce */
-int a_menu(const char *maintitle, const char *path, int lastlevel, char *trans_buffer);
+int a_menu(const char *maintitle, const char *path, int lastlevel, int lastbid, char *trans_buffer);
 void a_copyitem(const char* fpath, const char* title, const char* owner, int mode);
 int Announce(void);
 void gem(char* maintitle, item_t* path, int update);
diff --git a/include/pttstruct.h b/include/pttstruct.h
index d7cb7500..eb2edb5c 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -282,13 +282,6 @@ typedef struct {
     union   xitem_t X;
 } item_t;
 
-typedef struct {
-    item_t  *item[MAX_ITEMS];
-    char    mtitle[STRLEN];
-    char    *path;
-    int     num, page, now, level;
-} gmenu_t;
-
 #define FAVMAX   1024		  /* Max boards of Myfavorite */
 #define FAVGMAX    32             /* Max groups of Myfavorite */
 #define FAVGSLEN    8		  /* Max Length of Description String */
@@ -416,12 +409,13 @@ typedef struct {
     void *raw_memory;
 } screen_backup_t;
 
+// menu_t 其實是 gmenu_t (deprecated), 精華區專用 menu
 typedef struct {
     int     header_size;
     fileheader_t    *header;
     char    mtitle[STRLEN];
     const char    *path;
-    int     num, page, now, level;
+    int     num, page, now, level, bid;
 } menu_t;
 
 /* Used to pass commands to the readmenu.