mirror of
https://gitea.shironeko-all.duckdns.org/shironeko/Hytale-F2P-2.git
synced 2026-02-26 02:31:46 -03:00
fix: Discord ID int to str, duplicate run of cleanupDiscordRPC function, and dismiss setTimeout on discordRPC destroy
This commit is contained in:
12
main.js
12
main.js
@@ -30,7 +30,7 @@ let mainWindow;
|
|||||||
let discordRPC = null;
|
let discordRPC = null;
|
||||||
|
|
||||||
// Discord Rich Presence setup
|
// Discord Rich Presence setup
|
||||||
const DISCORD_CLIENT_ID = 1462244937868513373;
|
const DISCORD_CLIENT_ID = "1462244937868513373";
|
||||||
|
|
||||||
function initDiscordRPC() {
|
function initDiscordRPC() {
|
||||||
try {
|
try {
|
||||||
@@ -372,14 +372,9 @@ function cleanupDiscordRPC() {
|
|||||||
try {
|
try {
|
||||||
console.log('Cleaning up Discord RPC...');
|
console.log('Cleaning up Discord RPC...');
|
||||||
discordRPC.clearActivity();
|
discordRPC.clearActivity();
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
discordRPC.destroy();
|
discordRPC.destroy();
|
||||||
} catch (error) {
|
|
||||||
console.log('Error during final Discord RPC cleanup:', error.message);
|
|
||||||
}
|
|
||||||
}, 100);
|
|
||||||
discordRPC = null;
|
discordRPC = null;
|
||||||
|
console.log('Discord RPC cleaned up successfully');
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log('Error cleaning up Discord RPC:', error.message);
|
console.log('Error cleaning up Discord RPC:', error.message);
|
||||||
discordRPC = null;
|
discordRPC = null;
|
||||||
@@ -394,9 +389,6 @@ app.on('before-quit', () => {
|
|||||||
|
|
||||||
app.on('window-all-closed', () => {
|
app.on('window-all-closed', () => {
|
||||||
console.log('=== LAUNCHER CLOSING ===');
|
console.log('=== LAUNCHER CLOSING ===');
|
||||||
|
|
||||||
cleanupDiscordRPC();
|
|
||||||
|
|
||||||
app.quit();
|
app.quit();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user