From 2444b1f79aa599f147a2de742067f88778a61825 Mon Sep 17 00:00:00 2001 From: jfreegman Date: Mon, 28 Jun 2021 20:26:46 -0400 Subject: [PATCH] Merge with master (V0.11.1) --- Makefile | 6 +++--- src/windows.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ef62823..cbfbd23 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,9 @@ CFLAGS += ${USER_CFLAGS} LDFLAGS ?= LDFLAGS += ${USER_LDFLAGS} -OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o configdir.o curl_util.o execute.o -OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o conference.o help.o input.o line_info.o -OBJ += log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o +OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o conference.o configdir.o curl_util.o execute.o +OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o groupchats.o groupchat_commands.o help.o +OBJ += input.o line_info.o log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o OBJ += term_mplex.o toxic.o toxic_strings.o windows.o # Check if debug build is enabled diff --git a/src/windows.c b/src/windows.c index 20aeb0b..4c004e1 100644 --- a/src/windows.c +++ b/src/windows.c @@ -1142,7 +1142,7 @@ void kill_all_windows(Tox *m) case WINDOW_TYPE_GROUPCHAT: { exit_groupchat(w, m, w->num, user_settings->group_part_message, strlen(user_settings->group_part_message)); - break; + break; } default: {