From fa426283ca9d23f6398f4272d19c6508202f4611 Mon Sep 17 00:00:00 2001 From: Roberto <61295517+Bender22@users.noreply.github.com> Date: Thu, 20 Jun 2024 23:59:36 -0400 Subject: [PATCH 1/2] When running a game added manually it would close (#159) * fixed that when running a game that had been added manually it would close --- src-tauri/src/launchers/mod.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/launchers/mod.rs b/src-tauri/src/launchers/mod.rs index eb64554c..96484fa7 100644 --- a/src-tauri/src/launchers/mod.rs +++ b/src-tauri/src/launchers/mod.rs @@ -194,11 +194,9 @@ pub async fn handle_launch(data: GameObject) -> Result<(), crate::Error> { .wait()?; } _ => { - let command = format!( - "powershell start \"{}\\{}\"", - data.location, data.executable - ); + let command = format!("powershell start \"{}\"", data.executable); Command::new("cmd") + .current_dir(data.location) .args(&["/C", &command]) .spawn()? .wait()?; From e3a3c27e8cff2d66c61658486eafac834930242a Mon Sep 17 00:00:00 2001 From: p0ryae Date: Mon, 22 Jul 2024 20:33:46 -0700 Subject: [PATCH 2/2] Crucial Changes --- .gitattributes | 3 ++- index.html | 9 +++++++-- public/external.html => overlay.html | 11 ++++++++--- public/overlay.html | 13 ------------- src-tauri/tauri.conf.json | 5 ++--- src/components/find-games.vue | 1 - src/js/main.js | 4 ---- src/js/overlay.js | 4 ---- 8 files changed, 19 insertions(+), 31 deletions(-) rename public/external.html => overlay.html (55%) delete mode 100644 public/overlay.html delete mode 100644 src/js/main.js delete mode 100644 src/js/overlay.js diff --git a/.gitattributes b/.gitattributes index 34e793c3..0117072c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.html linguist-detectable=false -*.js linguist-detectable=false \ No newline at end of file +*.js linguist-detectable=false +*.vue linguist-detectable=false \ No newline at end of file diff --git a/index.html b/index.html index b17d574e..b13ee891 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -8,6 +8,11 @@
- + diff --git a/public/external.html b/overlay.html similarity index 55% rename from public/external.html rename to overlay.html index 0a9cb3f6..cf0217c4 100644 --- a/public/external.html +++ b/overlay.html @@ -1,4 +1,4 @@ - + @@ -7,7 +7,12 @@ Lazap -
- +
+ diff --git a/public/overlay.html b/public/overlay.html deleted file mode 100644 index f9edd79a..00000000 --- a/public/overlay.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - Lazap Overlay - - -
- - - diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2ac04208..01c6dc11 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -155,7 +155,6 @@ "center": false, "visible": false, "decorations": false, - "url": "external.html", "focus": false }, { @@ -170,8 +169,8 @@ "decorations": false, "focus": true, "alwaysOnTop": true, - "url": "overlay.html", - "skipTaskbar": true + "skipTaskbar": true, + "url": "overlay.html" } ] } diff --git a/src/components/find-games.vue b/src/components/find-games.vue index cce1afbb..c4812064 100644 --- a/src/components/find-games.vue +++ b/src/components/find-games.vue @@ -8,7 +8,6 @@ import image from "../assets/img/default-game-banner.png"; let isTyping = false; const typeSpeed = 50; -// Classes class GameElement { constructor(data, listID, jsondata, settings, bannerdirarr) { this.data = data; diff --git a/src/js/main.js b/src/js/main.js deleted file mode 100644 index 3128ea2f..00000000 --- a/src/js/main.js +++ /dev/null @@ -1,4 +0,0 @@ -import { createApp } from "vue"; -import App from "../App.vue"; - -createApp(App).mount("#app"); diff --git a/src/js/overlay.js b/src/js/overlay.js deleted file mode 100644 index f3898560..00000000 --- a/src/js/overlay.js +++ /dev/null @@ -1,4 +0,0 @@ -import { createApp } from "vue"; -import AppOverlay from "../AppOverlay.vue"; - -createApp(App).mount("#overlay");