Send rejoin packets on conference disconnection

We were mistakenly not making a rejoin attempt on freezing connections
due to all closest connections going down. This fixes that, and tweaks
the test. I've still only done tens rather than hundreds of tests, but
I'm fairly confident that the conference test now consistently passes.

1 files changed, 4 insertions, 3 deletions

diff --git a/toxcore/group.c b/toxcore/group.c
index c019c0eb..5feb483b 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -702,6 +702,8 @@ static int delpeer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, void
     return 0;
 }
 
+static bool try_send_rejoin(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_pk);
+
 static int freeze_peer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, void *userdata)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
@@ -710,6 +712,8 @@ static int freeze_peer(Group_Chats *g_c, uint32_t groupnumber, int peer_index, v
         return -1;
     }
 
+    try_send_rejoin(g_c, groupnumber, g->group[peer_index].real_pk);
+
     Group_Peer *temp = (Group_Peer *)realloc(g->frozen, sizeof(Group_Peer) * (g->numfrozen + 1));
 
     if (temp == nullptr) {
@@ -855,8 +859,6 @@ static void set_conns_status_groups(Group_Chats *g_c, int friendcon_id, uint8_t
     }
 }
 
-static bool try_send_rejoin(Group_Chats *g_c, uint32_t groupnumber, const uint8_t *real_pk);
-
 static void rejoin_frozen_friend(Group_Chats *g_c, int friendcon_id)
 {
     uint8_t real_pk[CRYPTO_PUBLIC_KEY_SIZE];
@@ -2844,7 +2846,6 @@ static int groupchat_freeze_timedout(Group_Chats *g_c, uint32_t groupnumber, voi
         }
 
         if (mono_time_is_timeout(g_c->mono_time, g->group[i].last_active, GROUP_PING_INTERVAL * 3)) {
-            try_send_rejoin(g_c, groupnumber, g->group[i].real_pk);
             freeze_peer(g_c, groupnumber, i, userdata);
         }
     }