From 3647f19b59593afbb805b155873a09ec77a7fd11 Mon Sep 17 00:00:00 2001
From: Aether <aether@lemonlink.eu>
Date: Mon, 23 Feb 2026 19:39:11 +0000
Subject: [PATCH] Fix Windows build: SystemTrayMenuItem, HashMap types,
 AppHandle clone

---
 src-tauri/src/events.rs |  3 ++-
 src-tauri/src/main.rs   | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src-tauri/src/events.rs b/src-tauri/src/events.rs
index 78ccba4..7ef71b0 100644
--- a/src-tauri/src/events.rs
+++ b/src-tauri/src/events.rs
@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use serde_json::Value;
+use tauri::{AppHandle, Manager};
 use tokio::sync::mpsc;
 use tracing::{debug, info};
 use uuid::Uuid;
@@ -25,7 +26,7 @@ pub struct Event {
 impl EventBus {
     pub fn new() -> Self {
         let (sender, mut receiver) = mpsc::unbounded_channel::<Event>();
-        let subscribers = Arc::new(Mutex::new(HashMap::new()));
+        let subscribers: Arc<Mutex<HashMap<String, Vec<(SubscriptionId, EventHandler)>>>> = Arc::new(Mutex::new(HashMap::new()));
         let subs_clone = subscribers.clone();
         
         // Event dispatch loop
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0330609..43a1bd5 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -10,7 +10,7 @@ mod settings;
 mod ocr;
 
 use std::sync::Arc;
-use tauri::{Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, WindowEvent};
+use tauri::{CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, WindowEvent};
 use tracing::info;
 
 use crate::api::PluginAPI;
@@ -25,12 +25,12 @@ fn main() {
     info!("Starting EU-Utility V3");
     
     let tray_menu = SystemTrayMenu::new()
-        .add_item(SystemTrayMenuItem::new("Show", "show"))
+        .add_item(CustomMenuItem::new("show", "Show"))
         .add_native_item(SystemTrayMenuItem::Separator)
-        .add_item(SystemTrayMenuItem::new("Settings", "settings"))
-        .add_item(SystemTrayMenuItem::new("Plugins", "plugins"))
+        .add_item(CustomMenuItem::new("settings", "Settings"))
+        .add_item(CustomMenuItem::new("plugins", "Plugins"))
         .add_native_item(SystemTrayMenuItem::Separator)
-        .add_item(SystemTrayMenuItem::new("Quit", "quit"));
+        .add_item(CustomMenuItem::new("quit", "Quit"));
     
     let system_tray = SystemTray::new().with_menu(tray_menu);
     
@@ -44,10 +44,10 @@ fn main() {
                     window.set_focus().unwrap();
                 }
                 "settings" => {
-                    api::show_settings_window(app);
+                    api::show_settings_window(app.clone());
                 }
                 "plugins" => {
-                    api::show_plugins_window(app);
+                    api::show_plugins_window(app.clone());
                 }
                 "quit" => {
                     std::process::exit(0);