mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge package.json, match version in electron/package.json

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-05-05 17:03:28 +01:00
commit a09f890619
53 changed files with 1046 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

2
electron/package.json
View file

@ -1,7 +1,7 @@
{
"name": "riot-web",
"main": "src/electron-main.js",
"version": "0.0.0",
"version": "0.9.8",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {

10
electron/src/electron-main.js
View file

@ -173,6 +173,7 @@ const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirector
});
if (shouldQuit) {
console.log("Other instance detected: exiting");
electron.app.quit()
}
@ -213,9 +214,12 @@ electron.app.on('ready', () => {
brand: vectorConfig.brand || 'Riot'
});
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
if (!process.argv.includes('--hidden')) {
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
}
mainWindow.on('closed', () => {
mainWindow = null;
});