From 2a6a0a2a3ee78f0ca0aa0b40102c839f1912ad3f Mon Sep 17 00:00:00 2001
From: Louis Pearson <desttinghimgame@gmail.com>
Date: Thu, 25 Apr 2019 02:45:01 -0600
Subject: [PATCH] Fix default server loading
Former-commit-id: 2273a32327c5268e4f6d5cce97bd58792a385c71
---
voxygen/src/menu/main/ui.rs | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs
index b50a75719f..c082ec8966 100644
--- a/voxygen/src/menu/main/ui.rs
+++ b/voxygen/src/menu/main/ui.rs
@@ -152,10 +152,12 @@ impl MainMenuUi {
// Load fonts
let load_font = |filename, ui: &mut Ui| {
let fullpath: String = ["/voxygen/font", filename].concat();
- ui.new_font(conrod_core::text::Font::from_bytes(
- assets::load(fullpath.as_str())
- .expect("Error loading file")
- ).unwrap())
+ ui.new_font(
+ conrod_core::text::Font::from_bytes(
+ assets::load(fullpath.as_str()).expect("Error loading file"),
+ )
+ .unwrap(),
+ )
};
let font_opensans = load_font("/OpenSans-Regular.ttf", &mut ui);
let font_metamorph = load_font("/Metamorphous-Regular.ttf", &mut ui);
@@ -167,7 +169,7 @@ impl MainMenuUi {
font_metamorph,
font_opensans,
username: networking.username.clone(),
- server_address,
+ server_address: networking.servers[networking.default_server].clone(),
login_error: None,
connecting: None,
show_servers: false,