2 files changed, 2 insertions, 1 deletions
diff --git a/mbbsd/calendar.c b/mbbsd/calendar.c
index 5cb644c2..7928f8a2 100644
--- a/mbbsd/calendar.c
+++ b/mbbsd/calendar.c
@@ -116,6 +116,7 @@ FreeEvent(event_t * e)
 
     while (e) {
 	n = e->next;
+	free(e->content); /* from strdup() */
 	free(e);
 	e = n;
     }
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 82516613..9e0958cf 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -810,7 +810,6 @@ u_editcalendar()
     getdata(b_lines - 1, 0, "行事曆 (D)刪除 (E)編輯 [Q]取消？[Q] ",
 	    genbuf, 3, LCECHO);
 
-    sethomefile(genbuf, cuser.userid, "calendar");
     if (genbuf[0] == 'e') {
 	int             aborted;
 
@@ -821,6 +820,7 @@ u_editcalendar()
 	    vmsg("行事曆更新完畢");
 	return 0;
     } else if (genbuf[0] == 'd') {
+	sethomefile(genbuf, cuser.userid, "calendar");
 	unlink(genbuf);
 	vmsg("行事曆刪除完畢");
     }