1 files changed, 4 insertions, 2 deletions
diff --git a/degesch.c b/degesch.c
index 2dd1ebc..4934d7d 100644
--- a/degesch.c
+++ b/degesch.c
@@ -2622,8 +2622,6 @@ buffer_remove (struct app_context *ctx, struct buffer *buffer)
 {
 	hard_assert (buffer != ctx->current_buffer);
 
-	// TODO: part from the channel if needed
-
 	input_destroy_buffer (&ctx->input, buffer->input_data);
 	buffer->input_data = NULL;
 
@@ -6091,6 +6089,10 @@ handle_buffer_close (struct app_context *ctx, struct handler_args *a)
 		log_global_error (ctx, "Can't close a server buffer");
 	else
 	{
+		// The user would be unable to recreate the buffer otherwise
+		if (buffer->type == BUFFER_CHANNEL)
+			irc_send (buffer->server, "PART %s", buffer->channel->name);
+
 		if (buffer == ctx->current_buffer)
 			buffer_activate (ctx, buffer_next (ctx, 1));
 		buffer_remove (ctx, buffer);