diff --git a/src/core/client.rs b/src/core/client.rs index 37699a1..8c346ef 100644 --- a/src/core/client.rs +++ b/src/core/client.rs @@ -5,7 +5,7 @@ use crate::{ data, drawable, fields, hmd, input, items, root::Root, spatial, - startup::{self, StartupSettings, DESKTOP_STARTUP_IDS}, + startup::{self, StartupSettings, STARTUP_SETTINGS}, Node, }, }; @@ -55,10 +55,8 @@ pub fn get_env(pid: i32) -> Result, std::io::Error> { )) } pub fn startup_settings(env: &FxHashMap) -> Option { - DESKTOP_STARTUP_IDS - .lock() - .get(env.get("STARDUST_STARTUP_TOKEN")?) - .cloned() + let token = env.get("STARDUST_STARTUP_TOKEN")?; + STARTUP_SETTINGS.lock().get(token).cloned() } pub struct Client { diff --git a/src/nodes/startup.rs b/src/nodes/startup.rs index 143d27a..0015b29 100644 --- a/src/nodes/startup.rs +++ b/src/nodes/startup.rs @@ -16,7 +16,7 @@ use std::{ }; lazy_static::lazy_static! { - pub static ref DESKTOP_STARTUP_IDS: Mutex> = Default::default(); + pub static ref STARTUP_SETTINGS: Mutex> = Default::default(); } #[derive(Default, Clone)] @@ -61,7 +61,7 @@ impl StartupSettings { ) -> Result> { let id = nanoid::nanoid!(); let data = serialize(&id)?; - DESKTOP_STARTUP_IDS + STARTUP_SETTINGS .lock() .insert(id, node.startup_settings.get().unwrap().lock().clone()); Ok(data)