From b4ea8dbf0d266d72c5cd9de2bbd6eb68534f6271 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Tue, 21 Nov 2017 22:01:52 +0100
Subject: fix merging issue

---
 src/components/services/content/ServiceWebview.js | 35 ++++++++++++-----------
 src/index.js                                      |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index abbf21dee..faa356d3d 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -85,29 +85,30 @@ export default class ServiceWebview extends Component {
             reload={reload}
           />
         )}
-        {!service.isEnabled && (
+        {!service.isEnabled ? (
           <ServiceDisabled
             name={service.recipe.name}
             webview={service.webview}
             enable={enable}
           />
+        ) : (
+          <Webview
+            ref={(element) => { this.webview = element; }}
+            autosize
+            src={service.url}
+            preload="./webview/plugin.js"
+            partition={`persist:service-${service.id}`}
+            onDidAttach={() => setWebviewReference({
+              serviceId: service.id,
+              webview: this.webview.view,
+            })}
+            onUpdateTargetUrl={this.updateTargetUrl}
+            useragent={service.userAgent}
+            muted={isAppMuted || service.isMuted}
+            disablewebsecurity
+            allowpopups
+          />
         )}
-        <Webview
-          ref={(element) => { this.webview = element; }}
-          autosize
-          src={service.url}
-          preload="./webview/plugin.js"
-          partition={`persist:service-${service.id}`}
-          onDidAttach={() => setWebviewReference({
-            serviceId: service.id,
-            webview: this.webview.view,
-          })}
-          onUpdateTargetUrl={this.updateTargetUrl}
-          useragent={service.userAgent}
-          muted={isAppMuted || service.isMuted}
-          disablewebsecurity
-          allowpopups
-        />
         {statusBar}
       </div>
     );
diff --git a/src/index.js b/src/index.js
index f4e906330..e21666086 100644
--- a/src/index.js
+++ b/src/index.js
@@ -58,7 +58,7 @@ const createWindow = () => {
     width: mainWindowState.width,
     height: mainWindowState.height,
     minWidth: 600,
-    minHeight: 400,
+    minHeight: 500,
     titleBarStyle: 'hidden',
     backgroundColor: '#3498db',
     autoHideMenuBar: true,
-- 
cgit v1.2.3-70-g09d2