From 2df19c4dd7241562d1352c73eb1baf1cd1208637 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 3 May 2018 21:17:28 +0900
Subject: [PATCH] Fix an error where the main page gets blank when adding a
 server

---
 src/browser/components/MattermostView.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx
index 8bdd4040..f887a13a 100644
--- 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();
     }
   },