--- lbbs/src/article_post.c	2025/06/15 06:19:21	1.18
+++ lbbs/src/article_post.c	2025/06/15 13:42:38	1.19
@@ -110,6 +110,9 @@ int article_post(const SECTION_LIST *p_s
 		{
 			switch (toupper(ch))
 			{
+			case KEY_NULL:
+			case KEY_TIMEOUT:
+				goto cleanup;
 			case CR:
 				igetch_reset();
 				break;
@@ -173,6 +176,9 @@ int article_post(const SECTION_LIST *p_s
 			{
 				switch (toupper(ch))
 				{
+				case KEY_NULL:
+				case KEY_TIMEOUT:
+					goto cleanup;
 				case CR:
 					igetch_reset();
 				case 'S':
@@ -201,6 +207,11 @@ int article_post(const SECTION_LIST *p_s
 		}
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	content = malloc(ARTICLE_CONTENT_MAX_LEN);
 	if (content == NULL)
 	{
@@ -506,6 +517,9 @@ int article_modify(const SECTION_LIST *p
 		{
 			switch (toupper(ch))
 			{
+			case KEY_NULL:
+			case KEY_TIMEOUT:
+				goto cleanup;
 			case CR:
 				igetch_reset();
 			case 'S':
@@ -526,6 +540,11 @@ int article_modify(const SECTION_LIST *p
 		}
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	// Allocate buffers in big size
 	content = malloc(ARTICLE_CONTENT_MAX_LEN);
 	if (content == NULL)
@@ -886,6 +905,9 @@ int article_reply(const SECTION_LIST *p_
 		{
 			switch (toupper(ch))
 			{
+			case KEY_NULL:
+			case KEY_TIMEOUT:
+				goto cleanup;
 			case CR:
 				igetch_reset();
 				break;
@@ -943,6 +965,9 @@ int article_reply(const SECTION_LIST *p_
 			{
 				switch (toupper(ch))
 				{
+				case KEY_NULL:
+				case KEY_TIMEOUT:
+					goto cleanup;
 				case CR:
 					igetch_reset();
 				case 'S':
@@ -971,6 +996,11 @@ int article_reply(const SECTION_LIST *p_
 		}
 	}
 
+	if (SYS_server_exit) // Do not save data on shutdown
+	{
+		goto cleanup;
+	}
+
 	content = malloc(ARTICLE_CONTENT_MAX_LEN);
 	if (content == NULL)
 	{