okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Core 2022-08-31 12:34:14 +01:00
commit 7bf3da670b
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/plugins/discordrpc.ts
View file

@ -105,7 +105,7 @@ export default class DiscordRPC {
this._client.destroy();
}
if (!this._utils.getStoreValue("connectivity.discord_rpc.enabled")) return
if (!this._utils.getStoreValue("connectivity.discord_rpc.enabled")) return;
this._client
.endlessLogin({
clientId: this._utils.getStoreValue("connectivity.discord_rpc.client") === "Cider" ? "911790844204437504" : "886578863147192350",
@ -219,11 +219,10 @@ export default class DiscordRPC {
return;
}
if (!attributes.status && this._utils.getStoreValue("connectivity.discord_rpc.clear_on_pause")) {
this._client.clearActivity();
} else if (activity && this._activityCache !== activity) {
if (this._utils.getStoreValue("general.privateEnabled")) return
if (this._utils.getStoreValue("general.privateEnabled")) return;
this._client.setActivity(activity);
}
this._activityCache = activity;

6
src/renderer/main/vueapp.js
View file

@ -256,10 +256,10 @@ const app = new Vue({
},
deep: true,
},
'cfg.connectivity.discord_rpc.enabled'(newValue) {
ipcRenderer.send("discordrpc:reload", newValue)
"cfg.connectivity.discord_rpc.enabled"(newValue) {
ipcRenderer.send("discordrpc:reload", newValue);
},
'mk.privateEnabled'(newValue) {
"mk.privateEnabled"(newValue) {
ipcRenderer.send("onPrivacyModeChange", newValue);
},
page: () => {