Merge branch 'olexorus/fix_serverlist_panic' into 'master'

Fix panic if default server index is out of bounds

See merge request veloren/veloren!909
This commit is contained in:
Imbris 2020-04-14 17:06:51 +00:00
commit b3c54a9bbb

View File

@ -205,7 +205,10 @@ impl MainMenuUi {
rot_imgs,
username: networking.username.clone(),
password: "".to_owned(),
server_address: networking.servers[networking.default_server].clone(),
server_address: networking
.servers
.get(networking.default_server)
.map_or_else(|| String::new(), |address| address.clone()),
popup: None,
connecting: None,
show_servers: false,