diff options
| author | irungentoo <irungentoo@tox.im> | 2014-02-19 12:34:21 -0500 |
|---|---|---|
| committer | irungentoo <irungentoo@tox.im> | 2014-02-19 12:34:21 -0500 |
| commit | fb757bcd49ed51ae0d6e9c3f743a1795f6b591f4 (patch) | |
| tree | bdeb18dc0a1d095e3747b3b464546e419c8ff6b6 | |
| parent | 354a392d696763b95ff35747989ab8821bd12934 (diff) | |
| parent | 7838973ef3fd9c04459efd038ffbe969f491a574 (diff) | |
Merge pull request #747 from Jman012/master
Groupchat crashing bug fixed.
| -rw-r--r-- | toxcore/group_chats.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c index 17914038..1ec8ede5 100644 --- a/toxcore/group_chats.c +++ b/toxcore/group_chats.c | |||
| @@ -787,6 +787,9 @@ static void del_dead_peers(Group_Chat *chat) | |||
| 787 | delpeer(chat, i); | 787 | delpeer(chat, i); |
| 788 | } | 788 | } |
| 789 | 789 | ||
| 790 | if (chat->group == NULL || i >= chat->numpeers) | ||
| 791 | break; | ||
| 792 | |||
| 790 | if (chat->group[i].deleted) { | 793 | if (chat->group[i].deleted) { |
| 791 | if (is_timeout(chat->group[i].deleted_time, DEL_PEER_DELAY)) | 794 | if (is_timeout(chat->group[i].deleted_time, DEL_PEER_DELAY)) |
| 792 | delpeer(chat, i); | 795 | delpeer(chat, i); |