fix(tray): perform clean shutdown on exit

Author: DASPRiD

Cargo.lock

@@ -9,6 +9,7 @@ mod plugins;
 mod tray;
 
 use crate::config::{load_config, Config};
+use crate::tray::TrayMessage;
 use anyhow::{bail, Context, Result};
 use async_osc::OscMessage;
 use clap::Parser;
@@ -132,26 +133,33 @@ impl Launcher {
     }
 
     async fn wait(&mut self, subsys: &SubsystemHandle) -> Result<()> {
-        let (reload_tx, mut reload_rx) = mpsc::channel(4);
-        let mut tray = tray::Tray::new(reload_tx, self.dark_mode_icons)?;
+        let (tray_tx, mut tray_rx) = mpsc::channel(4);
+        let mut tray = tray::Tray::new(tray_tx, self.dark_mode_icons)?;
         let mut maybe_plugin_subsys: Option<NestedSubsystem> = None;
 
         loop {
             select! {
-                Some(()) = reload_rx.recv() => {
-                    info!("Reloading plugins");
-                    self.config = Arc::new(load_config().await?);
-
-                    if let Some(plugin_subsys) = maybe_plugin_subsys {
-                        subsys.perform_partial_shutdown(plugin_subsys).await?;
-
-                        let config = self.config.clone();
-                        let receiver_tx = self.receiver_tx.clone();
-                        let sender_tx = self.sender_tx.clone();
-
-                        maybe_plugin_subsys = Some(subsys.start("Plugins", move |subsys| {
-                            run_plugins(subsys, config, receiver_tx, sender_tx)
-                        }));
+                Some(message) = tray_rx.recv() => {
+                    match message {
+                        TrayMessage::ReloadPlugins => {
+                            info!("Reloading plugins");
+                            self.config = Arc::new(load_config().await?);
+
+                            if let Some(plugin_subsys) = maybe_plugin_subsys {
+                                subsys.perform_partial_shutdown(plugin_subsys).await?;
+
+                                let config = self.config.clone();
+                                let receiver_tx = self.receiver_tx.clone();
+                                let sender_tx = self.sender_tx.clone();
+
+                                maybe_plugin_subsys = Some(subsys.start("Plugins", move |subsys| {
+                                    run_plugins(subsys, config, receiver_tx, sender_tx)
+                                }));
+                            }
+                        }
+                        TrayMessage::Exit => {
+                            subsys.request_shutdown();
+                        }
                     }
                 }
                 Some(vrchat_running) = self.rx.recv() => {

src/main.rs

@@ -63,21 +63,30 @@ fn get_active_icon(dark_mode: bool) -> IconSource {
     })
 }
 
+#[derive(Debug)]
+pub enum TrayMessage {
+    ReloadPlugins,
+    Exit,
+}
+
 pub struct Tray {
     tray: TrayItem,
     dark_mode_icons: bool,
 }
 
 impl Tray {
-    pub fn new(reload_tx: mpsc::Sender<()>, dark_mode_icons: bool) -> Result<Self> {
+    pub fn new(message_tx: mpsc::Sender<TrayMessage>, dark_mode_icons: bool) -> Result<Self> {
         let mut tray = TrayItem::new("VRC OSC Manager", get_inactive_icon(dark_mode_icons))?;
 
+        let reload_plugins_tx = message_tx.clone();
         tray.add_menu_item("Reload plugins", move || {
-            reload_tx.blocking_send(()).unwrap();
+            reload_plugins_tx
+                .blocking_send(TrayMessage::ReloadPlugins)
+                .unwrap();
         })?;
 
-        tray.add_menu_item("Exit", || {
-            std::process::exit(0);
+        tray.add_menu_item("Exit", move || {
+            message_tx.blocking_send(TrayMessage::Exit).unwrap();
         })?;
 
         Ok(Self {