1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-17 08:26:34 +01:00

merge with upstream

This commit is contained in:
Jfreegman
2015-04-04 03:36:09 -04:00
15 changed files with 397 additions and 94 deletions

View File

@@ -125,6 +125,7 @@ void exit_toxic_success(Tox *m)
store_data(m, DATA_FILE);
memset(&user_password, 0, sizeof(struct user_password));
kill_all_windows(m);
kill_all_file_transfers(m);
terminate_notify();
#ifdef AUDIO
@@ -518,7 +519,7 @@ int store_data(Tox *m, const char *path)
fclose(fp);
return -1;
}
} else {
} else { /* data will not be encrypted */
if (fwrite(data, data_len, 1, fp) != 1) {
fclose(fp);
return -1;