applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed rare crush in case of multiple query answers

Browse Source
This commit is contained in:
Vysheng 2014-09-08 20:48:59 +04:00
parent 8c20695284
commit 7f75a00442
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
queries.c
View File

@ -826,7 +826,9 @@ static int msg_send_on_answer (struct query *q UU) {
assert (x == CODE_messages_sent_message || x == CODE_messages_sent_message_link); assert (x == CODE_messages_sent_message || x == CODE_messages_sent_message_link);
int id = fetch_int (); // id int id = fetch_int (); // id
struct tgl_message *M = q->extra; struct tgl_message *M = q->extra;
bl_do_set_msg_id (M, id); if (M->id != id) {
bl_do_set_msg_id (M, id);
}
int date = fetch_int (); int date = fetch_int ();
int pts = fetch_int (); int pts = fetch_int ();
//tglu_fetch_seq (); //tglu_fetch_seq ();
@ -837,8 +839,10 @@ static int msg_send_on_answer (struct query *q UU) {
bl_do_set_pts (pts); bl_do_set_pts (pts);
bl_do_msg_seq_update (id); bl_do_msg_seq_update (id);
} else { } else {
vlogprintf (E_NOTICE, "Hole in seq\n"); if (seq > tgl_state.seq + 1) {
tgl_do_get_difference (0, 0, 0); vlogprintf (E_NOTICE, "Hole in seq\n");
tgl_do_get_difference (0, 0, 0);
}
} }
if (x == CODE_messages_sent_message_link) { if (x == CODE_messages_sent_message_link) {
assert (skip_type_any (TYPE_TO_PARAM_1 (vector, TYPE_TO_PARAM (contacts_link))) >= 0); assert (skip_type_any (TYPE_TO_PARAM_1 (vector, TYPE_TO_PARAM (contacts_link))) >= 0);
@ -1066,7 +1070,10 @@ static int mark_read_on_receive (struct query *q UU) {
bl_do_set_pts (pts); bl_do_set_pts (pts);
bl_do_set_seq (seq); bl_do_set_seq (seq);
} else { } else {
tgl_do_get_difference (0, 0, 0); if (seq > tgl_state.seq + 1) {
vlogprintf (E_NOTICE, "Hole in seq\n");
tgl_do_get_difference (0, 0, 0);
}
} }
int offset = fetch_int (); // offset int offset = fetch_int (); // offset
@ -1394,8 +1401,10 @@ static int send_file_on_answer (struct query *q UU) {
bl_do_set_pts (pts); bl_do_set_pts (pts);
bl_do_msg_seq_update (M->id); bl_do_msg_seq_update (M->id);
} else { } else {
vlogprintf (E_NOTICE, "Hole in seq\n"); if (seq > tgl_state.seq + 1) {
tgl_do_get_difference (0, 0, 0); vlogprintf (E_NOTICE, "Hole in seq\n");
tgl_do_get_difference (0, 0, 0);
}
} }
if (q->callback) { if (q->callback) {
@ -1814,8 +1823,10 @@ static int fwd_msg_on_answer (struct query *q UU) {
bl_do_set_pts (pts); bl_do_set_pts (pts);
bl_do_msg_seq_update (M->id); bl_do_msg_seq_update (M->id);
} else { } else {
vlogprintf (E_NOTICE, "Hole in seq\n"); if (seq > tgl_state.seq + 1) {
tgl_do_get_difference (0, 0, 0); vlogprintf (E_NOTICE, "Hole in seq\n");
tgl_do_get_difference (0, 0, 0);
}
} }
//print_message (M); //print_message (M);
if (q->callback) { if (q->callback) {
@ -1952,8 +1963,10 @@ static int rename_chat_on_answer (struct query *q UU) {
bl_do_set_pts (pts); bl_do_set_pts (pts);
bl_do_msg_seq_update (M->id); bl_do_msg_seq_update (M->id);
} else { } else {
vlogprintf (E_NOTICE, "Hole in seq\n"); if (seq > tgl_state.seq + 1) {
tgl_do_get_difference (0, 0, 0); vlogprintf (E_NOTICE, "Hole in seq\n");
tgl_do_get_difference (0, 0, 0);
}
} }
//print_message (M); //print_message (M);
if (q->callback) { if (q->callback) {