From 2fd49e0f3a4e08289d4d3553218529d7efbd9144 Mon Sep 17 00:00:00 2001
From: BowDown097 <btd6modsyeet@gmail.com>
Date: Wed, 5 Feb 2025 09:11:28 -0800
Subject: [PATCH] refactor: address requested changes (3)

---
 src/bar.rs                  | 3 ++-
 src/modules/focused.rs      | 3 +--
 src/modules/launcher/mod.rs | 2 +-
 src/modules/mod.rs          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bar.rs b/src/bar.rs
index 31d619d5..cbcdfdcc 100644
--- a/src/bar.rs
+++ b/src/bar.rs
@@ -9,6 +9,7 @@ use gtk::prelude::*;
 use gtk::{Application, ApplicationWindow, IconTheme, Orientation, Window, WindowType};
 use gtk_layer_shell::LayerShell;
 use std::rc::Rc;
+use std::sync::Arc;
 use std::time::Duration;
 use tracing::{debug, info};
 
@@ -268,7 +269,7 @@ impl Bar {
                     output_name: &self.monitor_name,
                     location: $location,
                     icon_theme: &icon_theme,
-                    icon_overrides: &self.ironbar.config.borrow().icon_overrides,
+                    icon_overrides: Arc::new(self.ironbar.config.borrow().icon_overrides.clone()),
                 }
             };
         }
diff --git a/src/modules/focused.rs b/src/modules/focused.rs
index 71a66b20..87fc81d5 100644
--- a/src/modules/focused.rs
+++ b/src/modules/focused.rs
@@ -9,7 +9,6 @@ use color_eyre::Result;
 use gtk::prelude::*;
 use gtk::Label;
 use serde::Deserialize;
-use std::sync::Arc;
 use tokio::sync::mpsc;
 use tracing::debug;
 
@@ -151,7 +150,7 @@ impl Module<gtk::Box> for FocusedModule {
         container.add(&label);
 
         {
-            let icon_overrides = Arc::new(info.icon_overrides.clone());
+            let icon_overrides = info.icon_overrides.clone();
             let icon_theme = info.icon_theme.clone();
 
             glib_recv!(context.subscribe(), data => {
diff --git a/src/modules/launcher/mod.rs b/src/modules/launcher/mod.rs
index 75a5b6ff..fa8c2062 100644
--- a/src/modules/launcher/mod.rs
+++ b/src/modules/launcher/mod.rs
@@ -165,7 +165,7 @@ impl Module<gtk::Box> for LauncherModule {
         let items = arc_mut!(items);
         let items2 = Arc::clone(&items);
 
-        let icon_overrides = Arc::new(info.icon_overrides.clone());
+        let icon_overrides = info.icon_overrides.clone();
 
         let tx = context.tx.clone();
         let tx2 = context.tx.clone();
diff --git a/src/modules/mod.rs b/src/modules/mod.rs
index 484d145f..a4a6a815 100644
--- a/src/modules/mod.rs
+++ b/src/modules/mod.rs
@@ -72,7 +72,7 @@ pub struct ModuleInfo<'a> {
     pub monitor: &'a Monitor,
     pub output_name: &'a str,
     pub icon_theme: &'a IconTheme,
-    pub icon_overrides: &'a HashMap<String, String>,
+    pub icon_overrides: Arc<HashMap<String, String>>,
 }
 
 #[derive(Debug, Clone)]