Merge pull request #787 from yuya-oc/fix-add-server-error

Fix an error where the main page gets blank when adding a server
mattermost · May 4, 2018 · 59e2e7e · 59e2e7e
2 parents 5b89bff + 2df19c4
commit 59e2e7e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx
@@ -227,9 +227,10 @@ const MattermostView = createReactClass({
 
   focusOnWebView() {
     const webview = findDOMNode(this.refs.webview);
-    if (!webview.getWebContents().isFocused()) {
+    const webContents = webview.getWebContents(); // webContents might not be created yet.
+    if (webContents && webContents.isFocused()) {
       webview.focus();
-      webview.getWebContents().focus();
+      webContents.focus();
     }
   },