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 settings move

Browse Source
This commit is contained in:
Louis Pearson
2019-09-06 04:06:26 -06:00
parent 8e5f993a5b
commit 3fe12ee85f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
voxygen/src/main.rs
View File

@ -31,10 +31,7 @@ pub mod window;
// Reexports // Reexports
pub use crate::error::Error; pub use crate::error::Error;
use crate::{ use crate::{audio::AudioFrontend, menu::main::MainMenuState, settings::Settings, window::Window};
audio::AudioFrontend, menu::main::MainMenuState, settings::Settings,
window::Window,
};
use heaptrack::track_mem; use heaptrack::track_mem;
use log::{self, debug, error, info}; use log::{self, debug, error, info};
@ -103,12 +100,10 @@ lazy_static! {
fn main() { fn main() {
// Load the settings // Load the settings
let settings = Settings::load(); let settings = Settings::load();
<<<<<<< HEAD
// Save settings to add new fields or create the file if it is not already there // Save settings to add new fields or create the file if it is not already there
if let Err(err) = settings.save_to_file() { if let Err(err) = settings.save_to_file() {
panic!("Failed to save settings: {:?}", err); panic!("Failed to save settings: {:?}", err);
} }
=======
let audio_device = match &settings.audio.audio_device { let audio_device = match &settings.audio.audio_device {
Some(d) => d.to_string(), Some(d) => d.to_string(),
None => audio::get_default_device(), None => audio::get_default_device(),
@ -124,7 +119,7 @@ fn main() {
window: Window::new(&settings).expect("Failed to create window!"), window: Window::new(&settings).expect("Failed to create window!"),
settings, settings,
}; };
>>>>>>> Revamp AudioFrontend let settings = &global_state.settings;
// Initialize logging. // Initialize logging.
let term_log_level = std::env::var_os("VOXYGEN_LOG") let term_log_level = std::env::var_os("VOXYGEN_LOG")