michael/discord-vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: make sure to properly destroy the rpc client

Browse source
This commit is contained in:
iCrawl 2017-11-23 22:14:16 +01:00
parent 6633506b2b
commit 1a185bf563
No known key found for this signature in database
GPG key ID: E41A6DB922EC2CFE
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/extension.ts
View file

@ -2,22 +2,26 @@ import { Client } from 'discord-rpc';
import { basename, extname } from 'path'; import { basename, extname } from 'path';
import { ExtensionContext, commands, window, workspace, Uri, TextDocumentChangeEvent, TextDocument } from 'vscode'; import { ExtensionContext, commands, window, workspace, Uri, TextDocumentChangeEvent, TextDocument } from 'vscode';
let rpc: Client;
export function activate(context: ExtensionContext) { export function activate(context: ExtensionContext) {
const rpc = new Client({ transport: 'ipc' }); rpc = new Client({ transport: 'ipc' });
const config = workspace.getConfiguration('discord'); const config = workspace.getConfiguration('discord');
rpc.once('ready', () => { rpc.once('ready', () => {
setActivity(rpc); setActivity();
workspace.onDidChangeTextDocument((e: TextDocumentChangeEvent) => setActivity(rpc)); workspace.onDidChangeTextDocument((e: TextDocumentChangeEvent) => setActivity());
}); });
rpc.login(config.get('clientID')).catch(error => rpc.login(config.get('clientID')).catch(error =>
window.showErrorMessage(`Could not connect to discord via rpc: ${error.message}`) window.showErrorMessage(`Could not connect to discord via rpc: ${error.message}`)
); );
} }
export function deactivate(context: ExtensionContext) {} export function deactivate(context: ExtensionContext) {
if (rpc) rpc.destroy();
}
function setActivity(rpc: Client): void { function setActivity(): void {
if (!rpc) return; if (!rpc) return;
const activity = { const activity = {
details: window.activeTextEditor ? `Editing ${basename(window.activeTextEditor.document.fileName)}` : 'Idle.', details: window.activeTextEditor ? `Editing ${basename(window.activeTextEditor.document.fileName)}` : 'Idle.',