Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-06-20 04:06:35 +02:00
Code Issues Projects Releases Wiki Activity

manually fix merge conflicts

Browse Source
This commit is contained in:
Jfreegman
2015-06-29 03:11:21 -04:00
parent 85d3c18ba6 51a1c660b4
commit 374b78c763
6 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/groupchat.c
View File

@ -142,7 +142,7 @@ int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum, uint8_t type)
|| groupchats[i].peer_name_lengths == NULL || groupchats[i].oldpeer_name_lengths == NULL)
exit_toxic_err(gettext("failed in init_groupchat_win"), FATALERR_MEMORY);
memcpy(&groupchats[i].oldpeer_names[0], UNKNOWN_NAME, sizeof(UNKNOWN_NAME));
memcpy(&groupchats[i].oldpeer_names[0], UNKNOWN_NAME, strlen(UNKNOWN_NAME));
groupchats[i].oldpeer_name_lengths[0] = (uint16_t) strlen(UNKNOWN_NAME);
#ifdef AUDIO