fix electron 4.x compatibility - 2

Signed-off-by: Bruce Zhang <zttt183525594@gmail.com>

3 files changed, 22 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7ad94eb89aa..95589ac79dbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron-ssr
 	pkgdesc = Shadowsocksr client using electron.
 	pkgver = 0.2.6
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/erguotou520/electron-ssr
 	arch = x86_64
 	license = MIT
@@ -25,7 +25,7 @@ pkgbase = electron-ssr
 	source = electron-ssr.sh
 	sha256sums = 87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735
 	sha256sums = f96b27d2f826bf4e1c96f0154516c1e2cf07536f745128a9c2e5ec113cea6446
-	sha256sums = a14bd77e44a7af02800711b35833294dc5316aba285ef461090c89a844cab794
+	sha256sums = 3ed8ee375e58f8f68f0d895862715b0b2efdc2a56cbbf9a5331aa9b2ca44377a
 	sha256sums = 5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f
 	source_x86_64 = electron-ssr-0.2.6.tar.gz::https://github.com/erguotou520/electron-ssr/archive/v0.2.6.tar.gz
 	sha256sums_x86_64 = 9f2b0bdec4aa1fe9916981694f922b6e93e7fb80d2b2d5bda80c25d837c3fdda
diff --git a/PKGBUILD b/PKGBUILD
index c6ab79b81e57..55da385395f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=electron-ssr
 pkgver=0.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc='Shadowsocksr client using electron.'
 arch=('x86_64')
 conflicts=("electron-ssr-git")
@@ -25,7 +25,7 @@ source_x86_64=("$pkgname-$pkgver.tar.gz::https://github.com/erguotou520/electron
 
 sha256sums=('87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735'
             'f96b27d2f826bf4e1c96f0154516c1e2cf07536f745128a9c2e5ec113cea6446'
-            '4be4d68ab9cf76ca8c4b7d8ce361a1054db65602eca69c50a9eab597d03fdef1'
+            '3ed8ee375e58f8f68f0d895862715b0b2efdc2a56cbbf9a5331aa9b2ca44377a'
             '5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f')
 sha256sums_x86_64=('9f2b0bdec4aa1fe9916981694f922b6e93e7fb80d2b2d5bda80c25d837c3fdda')
 
diff --git a/build.patch b/build.patch
index 41edfbe76689..1c2063eab2fb 100644
--- a/build.patch
+++ b/build.patch
@@ -63,18 +63,30 @@ diff -ura electron-ssr-0.2.6/src/main/logger.js electron-ssr-0.2.6-new/src/main/
  ensureDirSync(logFolder)
 
 diff -ura electron-ssr-0.2.6/src/main/index.js electron-ssr-0.2.6-new/src/main/index.js
---- electron-ssr-0.2.6/src/main/index.js        2019-04-12 14:42:05.591574100 +0800
-+++ electron-ssr-0.2.6-new/src/main/index.js    2019-04-12 14:43:48.209798254 +0800
-@@ -17,8 +17,11 @@
+--- electron-ssr-0.2.6/src/main/index.js        2019-04-12 15:05:00.420443178 +0800
++++ electron-ssr-0.2.6-new/src/main/index.js    2019-04-12 15:06:38.004324260 +0800
+@@ -17,7 +17,8 @@
  import { loadConfigsFromString } from '../shared/ssr'
  import { isMac, isWin } from '../shared/env'
  
 -const isSecondInstance = app.makeSingleInstance((argv, workingDirectory) => {
-+let isSecondInstance = false
 +app.requestSingleInstanceLock()
 +app.on('second-instance', (event, argv, workingDirectory) => {
    // Someone tried to run a second instance, we should focus our window.
-+  isSecondInstance = true
    const _window = getWindow()
    if (_window) {
-     if (_window.isMinimized()) {
+@@ -38,13 +39,8 @@
+       addConfigs(configs)
+     }
+   }
+-})
+-
+-if (isSecondInstance) {
+-  // cannot find module '../dialog'
+-  // https://github.com/electron/electron/issues/8862#issuecomment-294303518
+   app.exit()
+-}
++})
+ 
+ bootstrap.then(() => {
+   createWindow()