Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Downgraded to Electron 2 #1004

Merged
merged 2 commits into from Nov 15, 2018
Merged

Downgraded to Electron 2 #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e915232
Downgraded to Electron 2
Nov 15, 2018
381bc9b
Update RELEASENOTES.md
Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion RELEASENOTES.md
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
- None

## Bugfixes
- None
- The automatic updating was broken on Windows, to solve this the updater, builder and electron was downgraded to the latest stable versions. ([#1004](https://github.com/realm/realm-studio/pull/1004))

## Internal
- None
142 changes: 117 additions & 25 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@
"classnames": "^2.2.5",
"compare-versions": "^3.4.0",
"electron-store": "^2.0.0",
"electron-updater": "^4.0.0",
"electron-updater": "3.2.3",
"font-awesome": "^4.7.0",
"fs-extra": "^4.0.2",
"isomorphic-fetch": "^2.2.1",
Expand Down Expand Up @@ -193,8 +193,8 @@
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.4",
"devtron": "^1.4.0",
"electron": "3.0.8",
"electron-builder": "^20.34.0",
"electron": "2.0.13",
"electron-builder": "20.34.0",
"electron-download": "^4.1.1",
"electron-publisher-s3": "^20.17.2",
"faker": "^4.1.0",
Expand Down
5 changes: 1 addition & 4 deletions src/main/Application.ts
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@ export class Application {

public run() {
// Check to see if this is the first instance or not
const hasAnotherInstance = app.requestSingleInstanceLock() === false;
const hasAnotherInstance = app.makeSingleInstance(this.onInstanceStarted);

if (hasAnotherInstance) {
// Quit the app if started multiple times
Expand All @@ -136,8 +136,6 @@ export class Application {
if (app.isReady()) {
this.onReady();
}
// Handle any second instances of the Application
app.on('second-instance', this.onInstanceStarted);
}
}

Expand Down Expand Up @@ -512,7 +510,6 @@ export class Application {
* This is called when another instance of the app is started on Windows or Linux
*/
private onInstanceStarted = async (
event: Event,
argv: string[],
workingDirectory: string,
) => {
Expand Down