diff --git a/.gitignore b/.gitignore
index 212a339..902df57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,8 @@ dist-ssr
*.sln
*.sw?
+*.png
+*.bat
+*.exe
+
tsconfig.tsbuildinfo
\ No newline at end of file
diff --git a/rust/icons/ongeki.ico b/rust/icons/ongeki.ico
new file mode 100644
index 0000000..282cbe0
Binary files /dev/null and b/rust/icons/ongeki.ico differ
diff --git a/rust/src/cmd.rs b/rust/src/cmd.rs
index d9285b9..4dd5398 100644
--- a/rust/src/cmd.rs
+++ b/rust/src/cmd.rs
@@ -24,7 +24,7 @@ pub async fn startline(app: AppHandle) -> Result<(), String> {
}
if let Some(p) = &mut appd.profile {
log::debug!("{}", hash);
- p.line_up(app.clone(), hash).await
+ p.line_up(hash, app.clone()).await
.map_err(|e| format!("Lineup failed:\n{}", e))?;
p.start(app.clone()).await
.map_err(|e| format!("Startup failed:\n{}", e))?;
diff --git a/rust/src/modules/display_windows.rs b/rust/src/modules/display_windows.rs
index 82c6c79..ec0af80 100644
--- a/rust/src/modules/display_windows.rs
+++ b/rust/src/modules/display_windows.rs
@@ -20,23 +20,18 @@ impl Default for DisplayInfo {
}
impl Display {
- pub fn activate(&self, app: AppHandle) {
- let display = self.clone();
+ pub fn wait_for_exit(app: AppHandle, info: DisplayInfo) {
+ log::debug!("display: waiting");
tauri::async_runtime::spawn(async move {
- let info = display.line_up()?;
- if let Some(info) = info {
- app.listen("launch-end", move |_| {
- if let Err(e) = Self::clean_up(&info) {
- log::error!("Error cleaning up display: {:?}", e);
- }
- });
- }
-
- Ok::<(), anyhow::Error>(())
+ app.listen("launch-end", move |_| {
+ if let Err(e) = Self::clean_up(&info) {
+ log::error!("error cleaning up display: {:?}", e);
+ }
+ });
});
}
- fn line_up(&self) -> Result