Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:vector-im/riot-web into t3chguy/toasts3_2

This commit is contained in:
Michael Telatynski 2020-05-27 09:58:08 +01:00
commit c17bcda1ba
8 changed files with 611 additions and 513 deletions

View file

@ -384,12 +384,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
return Boolean(feedUrl);
}
startUpdateCheck = () => {
startUpdateCheck() {
if (this.showUpdateCheck) return;
super.startUpdateCheck();
ipcRenderer.send('check_updates');
};
}
installUpdate() {
// IPC to the main process to install the update, since quitAndInstall