vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

Clear tmp messages when abandoning room

Browse source 
There was a crash when you send a message and before the tmp message is
removed you change the room. When the real message arrive, we were
trying to remove the tmp message, but it was not there anymore so it
crash.

This commit fixes this problem.
This commit is contained in:
Daniel García Moreno 2017-12-21 08:20:43 +01:00
parent 8f9bd1d3a2
commit a7c9b58eb8
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fractal-gtk/src/app.rs
View file

@ -159,6 +159,7 @@ impl AppOp {
if let AppState::Chat = self.state {
self.room_panel(RoomPanel::NoRoom);
self.active_room = None;
self.clear_tmp_msgs();
}
}
@ -537,6 +538,7 @@ impl AppOp {
self.set_state(AppState::Chat);
self.room_panel(RoomPanel::NoRoom);
self.active_room = None;
self.clear_tmp_msgs();
}
self.cache_rooms();
@ -576,6 +578,7 @@ impl AppOp {
pub fn set_active_room(&mut self, room: &Room) {
self.active_room = Some(room.id.clone());
self.clear_tmp_msgs();
self.autoscroll = true;
self.remove_messages();
@ -809,6 +812,16 @@ impl AppOp {
};
}
pub fn clear_tmp_msgs(&mut self) {
let messages = self.gtk_builder
.get_object::<gtk::ListBox>("message_list")
.expect("Can't find message_list in ui file.");
for t in self.tmp_msgs.iter() {
messages.remove(&t.widget);
}
self.tmp_msgs.clear();
}
pub fn remove_tmp_room_message(&mut self, msg: &Message) {
let messages = self.gtk_builder
.get_object::<gtk::ListBox>("message_list")
@ -1155,6 +1168,7 @@ impl AppOp {
self.backend.send(BKCommand::LeaveRoom(r.clone())).unwrap();
self.rooms.remove(&r);
self.active_room = None;
self.clear_tmp_msgs();
self.room_panel(RoomPanel::NoRoom);
let store: gtk::TreeStore = self.gtk_builder