LCE-Hub-Mirrors/LCE-Emerald-Launcher
1
2
Fork 0
mirror of https://github.com/LCE-Hub/LCE-Emerald-Launcher.git synced 2026-08-20 04:27:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(rpc): discord rpc proper shutdown when launcher closes (#179)

Browse source
This commit is contained in:
João Pedro Carvalho 2026-08-11 07:30:51 -03:00 committed by GitHub
parent d536a6590b
commit 51a95949ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/context/LauncherContext.tsx
View file

@ -7,6 +7,7 @@ import { useSkinSync } from "../hooks/useSkinSync";
import { useDiscordRPC } from "../hooks/useDiscordRPC";
import { useGamepad } from "../hooks/useGamepad";
import { useUpdateCheck } from "../hooks/useUpdateCheck";
import RpcService from "../services/RpcService";
interface UIContextType {
activeView: string;
@ -161,8 +162,11 @@ export function LauncherProvider({ children }: { children: React.ReactNode }) {
const setupVisibilityDetection = async () => {
try {
const { listen } = await import("@tauri-apps/api/event");
const unlistenClose = await listen("tauri://close-requested", () => {
const unlistenClose = await listen("tauri://close-requested", async () => {
setIsWindowVisible(false);
if (config.rpcEnabled) {
await RpcService.StopRPC();
}
});
const unlistenShow = await listen("tauri://window-shown", () => {
@ -190,7 +194,7 @@ export function LauncherProvider({ children }: { children: React.ReactNode }) {
};
setupVisibilityDetection();
}, []);
}, [config.rpcEnabled]);
const uiValue = useMemo(() => ({
activeView, setActiveView, showIntro, setShowIntro,

15
src/services/RpcService.ts
View file

@ -1,4 +1,4 @@
import { setActivity, start } from "tauri-plugin-drpc";
import { setActivity, start, clearActivity, stop } from "tauri-plugin-drpc";
import {
Activity,
ActivityType,
@ -72,6 +72,19 @@ class RPC {
console.error("Failed to set RPC activity:", e);
}
}
public async StopRPC() {
try {
await clearActivity();
await stop();
} catch (e) {
// no need to handle errors here as the launcher will close anyways!
} finally {
this.initialized = false;
this.initializationPromise = null;
sessionStorage.removeItem("lce_rpc_started");
}
}
}
export default new RPC();