Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix default server loading

Browse Source 
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
This commit is contained in:
Louis Pearson
2019-04-25 02:45:01 -06:00
parent f434ab7de1
commit b6eebedac1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/menu/main/ui.rs
View File

@ -152,10 +152,12 @@ impl MainMenuUi {
// Load fonts // Load fonts
let load_font = |filename, ui: &mut Ui| { let load_font = |filename, ui: &mut Ui| {
let fullpath: String = ["/voxygen/font", filename].concat(); let fullpath: String = ["/voxygen/font", filename].concat();
ui.new_font(conrod_core::text::Font::from_bytes( ui.new_font(
assets::load(fullpath.as_str()) conrod_core::text::Font::from_bytes(
.expect("Error loading file") assets::load(fullpath.as_str()).expect("Error loading file"),
).unwrap()) )
.unwrap(),
)
}; };
let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui); let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui);
let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui); let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui);
@ -167,7 +169,7 @@ impl MainMenuUi {
font_metamorph, font_metamorph,
font_opensans, font_opensans,
username: networking.username.clone(), username: networking.username.clone(),
server_address, server_address: networking.servers[networking.default_server].clone(),
login_error: None, login_error: None,
connecting: None, connecting: None,
show_servers: false, show_servers: false,