From fb1799531b4638f8cd3a36ccb94425643aaa6082 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Fri, 8 Nov 2024 01:35:35 +0000
Subject: [PATCH] fix(tray): image updates lag 1 behind

---
 Cargo.toml              | 2 +-
 src/modules/tray/mod.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 340879f..45789f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -148,8 +148,8 @@ futures-signals = { version = "0.3.34", optional = true }
 sysinfo = { version = "0.29.11", optional = true }
 
 # tray
-system-tray = { version = "0.2.0", optional = true }
 system-tray = { version = "0.3.0", optional = true }
+png = { version = "0.17.14", optional = true }
 
 # upower
 upower_dbus = { version = "0.3.2", optional = true }
diff --git a/src/modules/tray/mod.rs b/src/modules/tray/mod.rs
index faba589..4fec1eb 100644
--- a/src/modules/tray/mod.rs
+++ b/src/modules/tray/mod.rs
@@ -211,13 +211,12 @@ fn on_update(
                 }
                 UpdateEvent::Icon(icon) => {
                     if icon.as_ref() != menu_item.icon_name() {
+                        menu_item.set_icon_name(icon);
                         match icon::get_image(menu_item, icon_theme, icon_size, prefer_icons) {
                             Ok(image) => menu_item.set_image(&image),
                             Err(_) => menu_item.show_label(),
                         };
                     }
-
-                    menu_item.set_icon_name(icon);
                 }
                 UpdateEvent::OverlayIcon(_icon) => {
                     warn!("received unimplemented NewOverlayIcon event");