aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2021-05-25 21:00:18 +0200
committerGitHub <noreply@github.com>2021-05-25 21:00:18 +0200
commitea8b1906e14c3b319d3ad184b6d7cfc507c23b4f (patch)
tree6fb5dd74ab3ca333591778bcf91d45fe988c2cd4 /mumd/src
parent4473bdd1536699c53f27085dd7d4d5d14dd93508 (diff)
parenta5a7a524981005c63931b62567ffca355965b2ba (diff)
downloadmum-ea8b1906e14c3b319d3ad184b6d7cfc507c23b4f.tar.gz
Merge pull request #85 from mum-rs/config-paths
remove cfg_exists, pass paths explicitly
Diffstat (limited to 'mumd/src')
-rw-r--r--mumd/src/state.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 45e7301..46df421 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -65,7 +65,7 @@ pub struct State {
impl State {
pub fn new() -> Result<Self, StateError> {
- let config = mumlib::config::read_default_cfg()?;
+ let config = mumlib::config::read_cfg(&mumlib::config::default_cfg_path())?;
let phase_watcher = watch::channel(StatePhase::Disconnected);
let audio_input = AudioInput::new(
config.audio.input_volume.unwrap_or(1.0),
@@ -574,7 +574,7 @@ impl State {
}
pub fn reload_config(&mut self) {
- match mumlib::config::read_default_cfg() {
+ match mumlib::config::read_cfg(&mumlib::config::default_cfg_path()) {
Ok(config) => {
self.config = config;
}