--- lbbs/src/screen.c	2025/05/10 14:37:04	1.43
+++ lbbs/src/screen.c	2025/05/11 11:50:03	1.46
@@ -112,18 +112,18 @@ static int _str_input(char *buffer, int
 	for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++)
 		;
 
-	while ((c = igetch_t(MIN(MAX_DELAY_TIME, 60))))
+	while (!SYS_server_exit && (c = igetch_t(MIN(MAX_DELAY_TIME, 60))))
 	{
 		if (c == CR)
 		{
 			igetch(1); // Cleanup remaining '\n' in the buffer
 			break;
 		}
-		else if (c == KEY_TIMEOUT)
+		else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe
 		{
 			return -1;
 		}
-		else if (c == KEY_NULL || c == LF)
+		else if (c == LF || c == '\0')
 		{
 			continue;
 		}
@@ -278,7 +278,7 @@ int display_file_ex(const char *filename
 	line = begin_line;
 	max_lines = screen_rows - 1;
 
-	while (loop)
+	while (!SYS_server_exit && loop)
 	{
 		if (c_line_current >= c_line_total && c_line_total <= screen_rows - 2)
 		{
@@ -313,12 +313,13 @@ int display_file_ex(const char *filename
 			iflush();
 
 			input_ok = 0;
-			while (!input_ok)
+			while (!SYS_server_exit && !input_ok)
 			{
 				ch = igetch_t(MAX_DELAY_TIME);
 				input_ok = 1;
 				switch (ch)
 				{
+				case KEY_NULL:
 				case KEY_TIMEOUT:
 					goto cleanup;
 				case KEY_UP: