From ffda9f6b2e3d69e4934169a85098520663be21e3 Mon Sep 17 00:00:00 2001 From: Ryan Butler Date: Tue, 26 Apr 2022 22:11:06 -0400 Subject: [PATCH] Added "terminated" and "other" events to "server-status", fixed icon --- .gitattributes | 1 - src-tauri/icons/icon.ico | Bin 82116 -> 82121 bytes src-tauri/src/main.rs | 8 ++++++-- 3 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index fcadb2cf9..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text eol=lf diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico index 685a8c0820b534cfe50c2f5162fc68e8659d608b..a68d9acc76916d93c4048b91b2b8fd9f53563f40 100644 GIT binary patch delta 50 zcmX@o$a=DowP6e6Bo#*9?LcBJFOar3Vw}$gr0-cUE@1)EO}31?nHYJe+d43|0|1{j B4+j7M delta 40 ycmV+@0N4M?fd#~Y1%R{xk|ej2Bmu1rw?Q%ip9Z(#I02*tw}w3dy8@R&KmmtBX%5f; diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 6c35d766a..12330a975 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -79,12 +79,16 @@ fn main() { CommandEvent::Stderr(s) => ("stderr", s), CommandEvent::Stdout(s) => ("stdout", s), CommandEvent::Error(s) => ("error", s), - _ => continue, + CommandEvent::Terminated(s) => ("terminated", format!("{s:?}")), + _ => ("other", "".to_string()), }; app_handle - .emit_all("server-stdio", emit_me) + .emit_all("server-status", emit_me) .expect("Failed to emit"); } + app_handle + .emit_all("server-status", ("other", "receiver cancelled")) + .expect("Failed to emit"); }); } Ok(())