From 34dab731500aa3cabd5dcf7237d4ec13d46b7940 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 7 Jun 2020 13:18:34 +0100
Subject: [PATCH] Fix riot-desktop manual update check getting stuck on
 Downloading...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/vector/platform/ElectronPlatform.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
index d2cf291da5..a0677264b4 100644
--- a/src/vector/platform/ElectronPlatform.tsx
+++ b/src/vector/platform/ElectronPlatform.tsx
@@ -44,7 +44,7 @@ import {randomString} from "matrix-js-sdk/src/randomstring";
 import {Action} from "matrix-react-sdk/src/dispatcher/actions";
 import {ActionPayload} from "matrix-react-sdk/src/dispatcher/payloads";
 import {showToast as showUpdateToast} from "matrix-react-sdk/src/toasts/UpdateToast";
-import { CheckUpdatesPayload } from 'matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload';
+import {CheckUpdatesPayload} from "matrix-react-sdk/src/dispatcher/payloads/CheckUpdatesPayload";
 
 const ipcRenderer = window.ipcRenderer;
 const isMac = navigator.platform.toUpperCase().includes('MAC');
@@ -228,8 +228,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
             rageshake.flush();
         });
 
-        ipcRenderer.on('ipcReply', this._onIpcReply.bind(this));
-        ipcRenderer.on('update-downloaded', this.onUpdateDownloaded.bind(this));
+        ipcRenderer.on('ipcReply', this._onIpcReply);
+        ipcRenderer.on('update-downloaded', this.onUpdateDownloaded);
 
         ipcRenderer.on('preferences', () => {
             dis.fire(Action.ViewUserSettings);
@@ -275,11 +275,15 @@ export default class ElectronPlatform extends VectorBasePlatform {
         return this._ipcCall('getConfig');
     }
 
-    async onUpdateDownloaded(ev, {releaseNotes, releaseName}) {
+    onUpdateDownloaded = async (ev, {releaseNotes, releaseName}) => {
+        dis.dispatch<CheckUpdatesPayload>({
+            action: Action.CheckUpdates,
+            status: UpdateCheckStatus.Ready,
+        });
         if (this.shouldShowUpdate(releaseName)) {
             showUpdateToast(await this.getAppVersion(), releaseName, releaseNotes);
         }
-    }
+    };
 
     getHumanReadableName(): string {
         return 'Electron Platform'; // no translation required: only used for analytics
@@ -426,7 +430,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
         });
     }
 
-    _onIpcReply(ev, payload) {
+    _onIpcReply = (ev, payload) => {
         if (payload.id === undefined) {
             console.warn("Ignoring IPC reply with no ID");
             return;
@@ -444,7 +448,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
         } else {
             callbacks.resolve(payload.reply);
         }
-    }
+    };
 
     getEventIndexingManager(): BaseEventIndexManager | null {
         return this.eventIndexManager;