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

If not default room, don't enter in the first one

Browse source
This commit is contained in:
Daniel García Moreno 2017-09-13 14:19:51 +02:00
parent 74795a03b4
commit ac897da69a
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/app.rs
View file

@ -346,13 +346,7 @@ impl AppOp {
array.sort_by(|x, y| x.name.to_lowercase().cmp(&y.name.to_lowercase()));
let mut default: Option<Room> = def;
for v in array {
if default.is_none() {
default = Some(v.clone());
}
let ns = match v.notifications {
0 => String::new(),
i => format!("{}", i),
@ -361,8 +355,8 @@ impl AppOp {
store.insert_with_values(None, None, &[0, 1, 2], &[&v.name, &v.id, &ns]);
}
if let Some(def) = default {
self.set_active_room(def.id, def.name);
if let Some(d) = def {
self.set_active_room(d.id, d.name);
} else {
self.room_panel(RoomPanel::NoRoom);
}