From 39f88b3513c148ae23102c2f74a4004ab0e3c559 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 24 Aug 2017 00:17:56 +0900
Subject: [PATCH 1/2] Cancel automatic reloading when an error page is manually
 reloaded

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

diff --git a/src/browser/components/MattermostView.jsx b/src/browser/components/MattermostView.jsx
index 26acd04a..22d55b14 100644
--- a/src/browser/components/MattermostView.jsx
+++ b/src/browser/components/MattermostView.jsx
@@ -1,3 +1,6 @@
+// eslint-disable react/no-set-state
+// setState() is necessary for this component
+
 const React = require('react');
 const PropTypes = require('prop-types');
 const createReactClass = require('create-react-class');
@@ -26,7 +29,8 @@ const MattermostView = createReactClass({
   getInitialState() {
     return {
       errorInfo: null,
-      isContextMenuAdded: false
+      isContextMenuAdded: false,
+      reloadTimeoutID: null
     };
   },
 
@@ -54,7 +58,9 @@ const MattermostView = createReactClass({
         self.reload();
       }
       if (navigator.onLine) {
-        setTimeout(reload, 30000);
+        self.setState({
+          reloadTimeoutID: setTimeout(reload, 30000)
+        });
       } else {
         window.addEventListener('online', reload);
       }
@@ -152,8 +158,10 @@ const MattermostView = createReactClass({
   },
 
   reload() {
+    clearTimeout(this.state.reloadTimeoutID);
     this.setState({
-      errorInfo: null
+      errorInfo: null,
+      reloadTimeoutID: null
     });
     var webview = findDOMNode(this.refs.webview);
     webview.reload();

From a09ff6d2b550c39f15bcd94c1aa688e46c43aa05 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 24 Aug 2017 21:16:36 +0900
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 086c2f89..4fa709b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,8 @@ Release date: TBD
  [#552](https://github.com/mattermost/desktop/issues/552)
  - Fixed the app publisher was not changed to Mattermost, Inc.
  [#542](https://github.com/mattermost/desktop/issues/542)
+ - Fixed an extra reloading when an error page is manually reloaded.
+ [#573](https://github.com/mattermost/desktop/issues/573)
 
 #### Windows
  - Fixed desktop notifications not working when the window has been minimized from inactive state.